From 408085c84b679838ee2af9a0d0b5b2a969893d91 Mon Sep 17 00:00:00 2001 From: Evgeny Stepanovych Date: Mon, 23 Sep 2024 15:50:06 +0200 Subject: [PATCH 1/5] NAS-131364: Migrate more components to standalone --- .eslintrc.cjs | 2 +- .../missing-access-wrapper.component.ts | 4 ++-- .../new-feature-indicator-wrapper.component.ts | 4 ++-- src/app/modules/alerts/alerts.module.ts | 4 ++-- .../copy-button/copy-button.component.ts | 4 ++-- .../error-dialog/error-dialog.component.ts | 4 ++-- .../general-dialog/general-dialog.component.ts | 4 ++-- .../info-dialog/info-dialog.component.ts | 4 ++-- .../job-progress-dialog.component.ts | 4 ++-- .../error-template/error-template.component.ts | 4 ++-- src/app/modules/empty/empty.component.ts | 4 ++-- src/app/modules/entity/entity.module.ts | 4 ++-- src/app/modules/feedback/feedback.module.ts | 4 ++-- .../components/ix-chips/ix-chips.component.ts | 4 ++-- .../ix-combobox/ix-combobox.component.ts | 4 ++-- .../ix-errors/ix-errors.component.ts | 4 ++-- .../ix-explorer/ix-explorer.component.ts | 4 ++-- .../ix-file-input/ix-file-input.component.ts | 4 ++-- .../ix-icon-group/ix-icon-group.component.ts | 4 ++-- .../components/ix-input/ix-input.component.ts | 4 ++-- .../ix-list-item/ix-list-item.component.ts | 4 ++-- .../ix-select/ix-select.component.ts | 4 ++-- .../ix-modal-header.component.ts | 4 ++-- .../ix-modal-header2.component.ts | 4 ++-- .../ix-star-rating/ix-star-rating.component.ts | 4 ++-- .../readonly-badge/readonly-badge.component.ts | 4 ++-- .../forms/search-input/search-input.module.ts | 4 ++-- .../search-input1/search-input1.component.ts | 4 ++-- .../global-search.component.spec.ts | 4 ++-- .../global-search/global-search.module.ts | 4 ++-- .../interface-status-icon.component.ts | 3 +-- src/app/modules/ix-icon/ix-icon.component.ts | 8 ++++++++ src/app/modules/ix-icon/ix-icon.module.ts | 18 ------------------ .../ix-empty-row/ix-empty-row.component.ts | 4 ++-- .../ix-cell-actions.component.ts | 4 ++-- .../ix-cell-state-button.component.ts | 4 ++-- .../ix-table-body/ix-table-body.component.ts | 4 ++-- .../ix-table-columns-selector.component.ts | 4 ++-- .../ix-table-head/ix-table-head.component.ts | 4 ++-- .../ix-table-pager/ix-table-pager.component.ts | 4 ++-- src/app/modules/ix-tree/tree.module.ts | 4 ++-- src/app/modules/jobs/jobs.module.ts | 4 ++-- .../admin-layout/admin-layout.component.ts | 4 ++-- .../layout/navigation/navigation.component.ts | 4 ++-- .../about-dialog/about-dialog.component.ts | 4 ++-- .../checkin-indicator.component.ts | 4 ++-- .../directory-services-indicator.component.ts | 4 ++-- .../directory-services-monitor.component.ts | 4 ++-- .../failover-upgrade-indicator.component.ts | 4 ++-- .../ha-status-icon/ha-status-icon.component.ts | 4 ++-- .../ha-status-popover.component.ts | 4 ++-- .../layout/topbar/ix-logo/ix-logo.component.ts | 4 ++-- .../jobs-indicator/jobs-indicator.component.ts | 4 ++-- .../topbar/power-menu/power-menu.component.ts | 4 ++-- .../resilvering-indicator.component.ts | 4 ++-- .../modules/layout/topbar/topbar.component.ts | 4 ++-- .../topbar/user-menu/user-menu.component.ts | 4 ++-- .../bulk-list-item/bulk-list-item.component.ts | 4 ++-- .../lists/dual-list/dual-list.module.ts | 4 ++-- .../lists/ordered-list/ordered-list.module.ts | 4 ++-- src/app/modules/loader/app-loader.module.ts | 4 ++-- src/app/modules/scheduler/scheduler.module.ts | 4 ++-- src/app/modules/snackbar/snackbar.module.ts | 4 ++-- src/app/modules/tooltip/tooltip.component.ts | 4 ++-- .../modules/truecommand/truecommand.module.ts | 4 ++-- src/app/pages/account/account.module.ts | 4 ++-- src/app/pages/account/groups/groups.module.ts | 4 ++-- src/app/pages/account/users/users.module.ts | 4 ++-- src/app/pages/api-keys/api-keys.module.ts | 4 ++-- src/app/pages/apps/apps.module.ts | 4 ++-- .../app-state-cell/app-state-cell.component.ts | 4 ++-- .../app-update-cell.component.ts | 4 ++-- .../custom-forms/custom-forms.module.ts | 4 ++-- src/app/pages/audit/audit.module.ts | 4 ++-- .../pages/credentials/credentials.module.ts | 4 ++-- src/app/pages/dashboard/dashboard.module.ts | 4 ++-- .../data-protection/data-protection.module.ts | 4 ++-- src/app/pages/datasets/datasets.module.ts | 4 ++-- .../modules/encryption/encryption.module.ts | 4 ++-- .../modules/permissions/permissions.module.ts | 4 ++-- .../modules/snapshots/snapshots.module.ts | 4 ++-- .../directory-service.module.ts | 4 ++-- src/app/pages/jobs/jobs-list.module.ts | 4 ++-- src/app/pages/network/network.module.ts | 4 ++-- .../reports-dashboard.module.ts | 4 ++-- src/app/pages/services/services.module.ts | 4 ++-- src/app/pages/sharing/sharing.module.ts | 4 ++-- .../insecure-connection.component.ts | 4 ++-- src/app/pages/signin/signin.component.spec.ts | 4 ++-- src/app/pages/signin/signin.component.ts | 4 ++-- .../storage/modules/devices/devices.module.ts | 4 ++-- .../storage/modules/disks/disks.module.ts | 4 ++-- .../pool-manager/pool-manager.module.ts | 6 +++--- src/app/pages/storage/storage.module.ts | 4 ++-- .../pages/system-tasks/system-tasks.module.ts | 4 ++-- .../pages/system/enclosure/enclosure.module.ts | 4 ++-- src/app/pages/system/system.module.ts | 4 ++-- src/app/pages/vm/vm.module.ts | 4 ++-- src/setup-jest.ts | 4 ++-- 99 files changed, 201 insertions(+), 212 deletions(-) delete mode 100644 src/app/modules/ix-icon/ix-icon.module.ts diff --git a/.eslintrc.cjs b/.eslintrc.cjs index 19d9e5c0775..7d7037554c0 100644 --- a/.eslintrc.cjs +++ b/.eslintrc.cjs @@ -286,7 +286,7 @@ module.exports = { { "name": "@angular/material/icon", "importNames": ["MatIconModule"], - "message": "Use IxIconModule instead." + "message": "Use IxIconComponent instead." }, { "name": "@angular/core", diff --git a/src/app/directives/has-access/missing-access-wrapper.component.ts b/src/app/directives/has-access/missing-access-wrapper.component.ts index 2f49b25fa11..5062f289a52 100644 --- a/src/app/directives/has-access/missing-access-wrapper.component.ts +++ b/src/app/directives/has-access/missing-access-wrapper.component.ts @@ -5,7 +5,7 @@ import { import { MatTooltip } from '@angular/material/tooltip'; import { TranslateModule } from '@ngx-translate/core'; import { DisableFocusableElementsDirective } from 'app/directives/disable-focusable-elements/disable-focusable-elements.directive'; -import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module'; +import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; @Component({ selector: 'ix-missing-access-wrapper', @@ -17,8 +17,8 @@ import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module'; DisableFocusableElementsDirective, MatTooltip, NgTemplateOutlet, - IxIconModule, TranslateModule, + IxIconComponent, ], }) export class MissingAccessWrapperComponent { diff --git a/src/app/directives/new-feature-indicator/new-feature-indicator-wrapper.component.ts b/src/app/directives/new-feature-indicator/new-feature-indicator-wrapper.component.ts index 48c5a873ce0..7d9fb0019de 100644 --- a/src/app/directives/new-feature-indicator/new-feature-indicator-wrapper.component.ts +++ b/src/app/directives/new-feature-indicator/new-feature-indicator-wrapper.component.ts @@ -8,7 +8,7 @@ import { import { NgxPopperjsModule } from 'ngx-popperjs'; import { NewFeatureIndicator } from 'app/directives/new-feature-indicator/new-feature-indicator.interface'; import { NewFeatureIndicatorService } from 'app/directives/new-feature-indicator/new-feature-indicator.service'; -import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module'; +import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; import { CastPipe } from 'app/modules/pipes/cast/cast.pipe'; import { TestIdModule } from 'app/modules/test-id/test-id.module'; @@ -30,7 +30,7 @@ import { TestIdModule } from 'app/modules/test-id/test-id.module'; NgxPopperjsModule, TestIdModule, NgTemplateOutlet, - IxIconModule, + IxIconComponent, CastPipe, ], }) diff --git a/src/app/modules/alerts/alerts.module.ts b/src/app/modules/alerts/alerts.module.ts index 627138de7e6..c869408e904 100644 --- a/src/app/modules/alerts/alerts.module.ts +++ b/src/app/modules/alerts/alerts.module.ts @@ -18,7 +18,7 @@ import { AlertsPanelComponent } from 'app/modules/alerts/components/alerts-panel import { AlertEffects } from 'app/modules/alerts/store/alert.effects'; import { alertReducer } from 'app/modules/alerts/store/alert.reducer'; import { alertStateKey } from 'app/modules/alerts/store/alert.selectors'; -import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module'; +import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; import { FormatDateTimePipe } from 'app/modules/pipes/format-date-time/format-datetime.pipe'; import { TestIdModule } from 'app/modules/test-id/test-id.module'; @@ -29,7 +29,7 @@ import { TestIdModule } from 'app/modules/test-id/test-id.module'; TranslateModule, MatButtonModule, MatMenuModule, - IxIconModule, + IxIconComponent, RouterModule, MatCheckboxModule, MatProgressBarModule, diff --git a/src/app/modules/buttons/copy-button/copy-button.component.ts b/src/app/modules/buttons/copy-button/copy-button.component.ts index 4576e13b2cb..7f38f6b5bc3 100644 --- a/src/app/modules/buttons/copy-button/copy-button.component.ts +++ b/src/app/modules/buttons/copy-button/copy-button.component.ts @@ -5,7 +5,7 @@ import { MatIconButton } from '@angular/material/button'; import { MatMenu, MatMenuItem, MatMenuTrigger } from '@angular/material/menu'; import { MatTooltip } from '@angular/material/tooltip'; import { TranslateModule, TranslateService } from '@ngx-translate/core'; -import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module'; +import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; import { SnackbarService } from 'app/modules/snackbar/services/snackbar.service'; import { TestIdModule } from 'app/modules/test-id/test-id.module'; @@ -20,7 +20,7 @@ import { TestIdModule } from 'app/modules/test-id/test-id.module'; MatTooltip, TestIdModule, TranslateModule, - IxIconModule, + IxIconComponent, MatMenuTrigger, MatMenu, MatMenuItem, diff --git a/src/app/modules/dialog/components/error-dialog/error-dialog.component.ts b/src/app/modules/dialog/components/error-dialog/error-dialog.component.ts index ca4d4ba087a..4c84ffd904e 100644 --- a/src/app/modules/dialog/components/error-dialog/error-dialog.component.ts +++ b/src/app/modules/dialog/components/error-dialog/error-dialog.component.ts @@ -12,7 +12,7 @@ import { TranslateModule } from '@ngx-translate/core'; import { Job } from 'app/interfaces/job.interface'; import { CopyButtonComponent } from 'app/modules/buttons/copy-button/copy-button.component'; import { DialogService } from 'app/modules/dialog/dialog.service'; -import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module'; +import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; import { TestIdModule } from 'app/modules/test-id/test-id.module'; import { DownloadService } from 'app/services/download.service'; import { ErrorHandlerService } from 'app/services/error-handler.service'; @@ -27,7 +27,7 @@ import { WebSocketService } from 'app/services/ws.service'; standalone: true, imports: [ MatDialogTitle, - IxIconModule, + IxIconComponent, CdkScrollable, MatDialogContent, CopyButtonComponent, diff --git a/src/app/modules/dialog/components/general-dialog/general-dialog.component.ts b/src/app/modules/dialog/components/general-dialog/general-dialog.component.ts index 6f2a4260629..5caaa0e5a89 100644 --- a/src/app/modules/dialog/components/general-dialog/general-dialog.component.ts +++ b/src/app/modules/dialog/components/general-dialog/general-dialog.component.ts @@ -5,7 +5,7 @@ import { MatDialogRef, MatDialogTitle, MatDialogContent, MatDialogActions, } from '@angular/material/dialog'; import { TranslateModule } from '@ngx-translate/core'; -import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module'; +import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; import { TestIdModule } from 'app/modules/test-id/test-id.module'; export interface GeneralDialogConfig { @@ -33,7 +33,7 @@ export interface GeneralDialogConfig { standalone: true, imports: [ MatDialogTitle, - IxIconModule, + IxIconComponent, CdkScrollable, MatDialogContent, MatDialogActions, diff --git a/src/app/modules/dialog/components/info-dialog/info-dialog.component.ts b/src/app/modules/dialog/components/info-dialog/info-dialog.component.ts index c3c9deb7aae..6c23b30bf60 100644 --- a/src/app/modules/dialog/components/info-dialog/info-dialog.component.ts +++ b/src/app/modules/dialog/components/info-dialog/info-dialog.component.ts @@ -5,7 +5,7 @@ import { MatDialogRef, MatDialogTitle, MatDialogContent, MatDialogActions, } from '@angular/material/dialog'; import { TranslateModule } from '@ngx-translate/core'; -import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module'; +import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; import { TestIdModule } from 'app/modules/test-id/test-id.module'; @Component({ @@ -16,7 +16,7 @@ import { TestIdModule } from 'app/modules/test-id/test-id.module'; standalone: true, imports: [ MatDialogTitle, - IxIconModule, + IxIconComponent, CdkScrollable, MatDialogContent, MatDialogActions, diff --git a/src/app/modules/dialog/components/job-progress/job-progress-dialog.component.ts b/src/app/modules/dialog/components/job-progress/job-progress-dialog.component.ts index 7c057eae1af..407f15a3bf0 100644 --- a/src/app/modules/dialog/components/job-progress/job-progress-dialog.component.ts +++ b/src/app/modules/dialog/components/job-progress/job-progress-dialog.component.ts @@ -13,7 +13,7 @@ import { TranslateModule } from '@ngx-translate/core'; import { Observable, Subscription, map } from 'rxjs'; import { JobState } from 'app/enums/job-state.enum'; import { Job, JobProgress } from 'app/interfaces/job.interface'; -import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module'; +import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; import { TestIdModule } from 'app/modules/test-id/test-id.module'; import { ErrorHandlerService } from 'app/services/error-handler.service'; import { WebSocketService } from 'app/services/ws.service'; @@ -61,7 +61,7 @@ export interface JobProgressDialogConfig { TestIdModule, MatIconButton, MatDialogClose, - IxIconModule, + IxIconComponent, TranslateModule, DecimalPipe, ], diff --git a/src/app/modules/dialog/components/multi-error-dialog/error-template/error-template.component.ts b/src/app/modules/dialog/components/multi-error-dialog/error-template/error-template.component.ts index 40c1dcb4686..c4e9d008f2b 100644 --- a/src/app/modules/dialog/components/multi-error-dialog/error-template/error-template.component.ts +++ b/src/app/modules/dialog/components/multi-error-dialog/error-template/error-template.component.ts @@ -8,7 +8,7 @@ import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy'; import { TranslateModule } from '@ngx-translate/core'; import { Job } from 'app/interfaces/job.interface'; import { DialogService } from 'app/modules/dialog/dialog.service'; -import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module'; +import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; import { TestIdModule } from 'app/modules/test-id/test-id.module'; import { DownloadService } from 'app/services/download.service'; import { ErrorHandlerService } from 'app/services/error-handler.service'; @@ -23,7 +23,7 @@ import { WebSocketService } from 'app/services/ws.service'; standalone: true, imports: [ MatDialogTitle, - IxIconModule, + IxIconComponent, MatButton, TestIdModule, TranslateModule, diff --git a/src/app/modules/empty/empty.component.ts b/src/app/modules/empty/empty.component.ts index f14b15a737c..b3eb1d7b767 100644 --- a/src/app/modules/empty/empty.component.ts +++ b/src/app/modules/empty/empty.component.ts @@ -6,7 +6,7 @@ import { RequiresRolesDirective } from 'app/directives/requires-roles/requires-r import { EmptyType } from 'app/enums/empty-type.enum'; import { Role } from 'app/enums/role.enum'; import { EmptyConfig } from 'app/interfaces/empty-config.interface'; -import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module'; +import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; import { TestIdModule } from 'app/modules/test-id/test-id.module'; @Component({ @@ -19,7 +19,7 @@ import { TestIdModule } from 'app/modules/test-id/test-id.module'; MatButtonModule, TranslateModule, MatProgressSpinnerModule, - IxIconModule, + IxIconComponent, TestIdModule, RequiresRolesDirective, ], diff --git a/src/app/modules/entity/entity.module.ts b/src/app/modules/entity/entity.module.ts index c2adef08d0b..56799345c0e 100644 --- a/src/app/modules/entity/entity.module.ts +++ b/src/app/modules/entity/entity.module.ts @@ -6,7 +6,7 @@ import { MatProgressBarModule } from '@angular/material/progress-bar'; import { MatSliderModule } from '@angular/material/slider'; import { TranslateModule } from '@ngx-translate/core'; import { EntityJobComponent } from 'app/modules/entity/entity-job/entity-job.component'; -import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module'; +import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; import { TestIdModule } from 'app/modules/test-id/test-id.module'; @NgModule({ @@ -15,7 +15,7 @@ import { TestIdModule } from 'app/modules/test-id/test-id.module'; MatProgressBarModule, MatButtonModule, TestIdModule, - IxIconModule, + IxIconComponent, TranslateModule, MatSliderModule, DecimalPipe, diff --git a/src/app/modules/feedback/feedback.module.ts b/src/app/modules/feedback/feedback.module.ts index 0a330cfe90a..b154b1bc5c1 100644 --- a/src/app/modules/feedback/feedback.module.ts +++ b/src/app/modules/feedback/feedback.module.ts @@ -25,7 +25,7 @@ import { IxInputComponent } from 'app/modules/forms/ix-forms/components/ix-input import { IxSelectComponent } from 'app/modules/forms/ix-forms/components/ix-select/ix-select.component'; import { IxStarRatingComponent } from 'app/modules/forms/ix-forms/components/ix-star-rating/ix-star-rating.component'; import { IxTextareaComponent } from 'app/modules/forms/ix-forms/components/ix-textarea/ix-textarea.component'; -import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module'; +import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; import { AppLoaderModule } from 'app/modules/loader/app-loader.module'; import { CastPipe } from 'app/modules/pipes/cast/cast.pipe'; import { TestIdModule } from 'app/modules/test-id/test-id.module'; @@ -33,7 +33,7 @@ import { TestIdModule } from 'app/modules/test-id/test-id.module'; @NgModule({ imports: [ AppLoaderModule, - IxIconModule, + IxIconComponent, RouterModule, MatButtonModule, MatDialogModule, diff --git a/src/app/modules/forms/ix-forms/components/ix-chips/ix-chips.component.ts b/src/app/modules/forms/ix-forms/components/ix-chips/ix-chips.component.ts index 339af08a569..9e7ba77571a 100644 --- a/src/app/modules/forms/ix-forms/components/ix-chips/ix-chips.component.ts +++ b/src/app/modules/forms/ix-forms/components/ix-chips/ix-chips.component.ts @@ -27,7 +27,7 @@ import { Option } from 'app/interfaces/option.interface'; import { ChipsProvider } from 'app/modules/forms/ix-forms/components/ix-chips/chips-provider'; import { IxErrorsComponent } from 'app/modules/forms/ix-forms/components/ix-errors/ix-errors.component'; import { IxLabelComponent } from 'app/modules/forms/ix-forms/components/ix-label/ix-label.component'; -import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module'; +import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; import { TestIdModule } from 'app/modules/test-id/test-id.module'; @UntilDestroy() @@ -42,7 +42,7 @@ import { TestIdModule } from 'app/modules/test-id/test-id.module'; TestIdModule, MatChipGrid, MatChipRow, - IxIconModule, + IxIconComponent, MatChipRemove, MatAutocompleteTrigger, MatChipInput, diff --git a/src/app/modules/forms/ix-forms/components/ix-combobox/ix-combobox.component.ts b/src/app/modules/forms/ix-forms/components/ix-combobox/ix-combobox.component.ts index 801faa12e52..c645e4212da 100644 --- a/src/app/modules/forms/ix-forms/components/ix-combobox/ix-combobox.component.ts +++ b/src/app/modules/forms/ix-forms/components/ix-combobox/ix-combobox.component.ts @@ -29,7 +29,7 @@ import { Option } from 'app/interfaces/option.interface'; import { IxComboboxProvider, IxComboboxProviderManager } from 'app/modules/forms/ix-forms/components/ix-combobox/ix-combobox-provider'; import { IxErrorsComponent } from 'app/modules/forms/ix-forms/components/ix-errors/ix-errors.component'; import { IxLabelComponent } from 'app/modules/forms/ix-forms/components/ix-label/ix-label.component'; -import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module'; +import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; import { TestIdModule } from 'app/modules/test-id/test-id.module'; @UntilDestroy() @@ -45,7 +45,7 @@ import { TestIdModule } from 'app/modules/test-id/test-id.module'; MatInput, MatAutocompleteTrigger, MatProgressSpinner, - IxIconModule, + IxIconComponent, MatAutocomplete, MatOption, IxErrorsComponent, diff --git a/src/app/modules/forms/ix-forms/components/ix-errors/ix-errors.component.ts b/src/app/modules/forms/ix-forms/components/ix-errors/ix-errors.component.ts index 0ade24f2d08..5d86b65b2f8 100644 --- a/src/app/modules/forms/ix-forms/components/ix-errors/ix-errors.component.ts +++ b/src/app/modules/forms/ix-forms/components/ix-errors/ix-errors.component.ts @@ -10,7 +10,7 @@ import { Subscription } from 'rxjs'; import { filter } from 'rxjs/operators'; import { DefaultValidationError } from 'app/enums/default-validation-error.enum'; import { IxSimpleChanges } from 'app/interfaces/simple-changes.interface'; -import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module'; +import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; type SomeError = Record; @@ -25,7 +25,7 @@ export const ixManualValidateError = 'ixManualValidateError'; standalone: true, imports: [ MatError, - IxIconModule, + IxIconComponent, MatTooltip, TranslateModule, ], diff --git a/src/app/modules/forms/ix-forms/components/ix-explorer/ix-explorer.component.ts b/src/app/modules/forms/ix-forms/components/ix-explorer/ix-explorer.component.ts index bffbf8205cc..a4920b29962 100644 --- a/src/app/modules/forms/ix-forms/components/ix-explorer/ix-explorer.component.ts +++ b/src/app/modules/forms/ix-forms/components/ix-explorer/ix-explorer.component.ts @@ -31,7 +31,7 @@ import { IxErrorsComponent } from 'app/modules/forms/ix-forms/components/ix-erro import { CreateDatasetDialogComponent } from 'app/modules/forms/ix-forms/components/ix-explorer/create-dataset-dialog/create-dataset-dialog.component'; import { TreeNodeProvider } from 'app/modules/forms/ix-forms/components/ix-explorer/tree-node-provider.interface'; import { IxLabelComponent } from 'app/modules/forms/ix-forms/components/ix-label/ix-label.component'; -import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module'; +import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; import { TestIdModule } from 'app/modules/test-id/test-id.module'; @UntilDestroy() @@ -46,7 +46,7 @@ import { TestIdModule } from 'app/modules/test-id/test-id.module'; TestIdModule, MatInput, MatButton, - IxIconModule, + IxIconComponent, TreeModule, MatError, IxErrorsComponent, diff --git a/src/app/modules/forms/ix-forms/components/ix-file-input/ix-file-input.component.ts b/src/app/modules/forms/ix-forms/components/ix-file-input/ix-file-input.component.ts index e9edeb6bca8..2c1c679787f 100644 --- a/src/app/modules/forms/ix-forms/components/ix-file-input/ix-file-input.component.ts +++ b/src/app/modules/forms/ix-forms/components/ix-file-input/ix-file-input.component.ts @@ -10,7 +10,7 @@ import { TranslateModule } from '@ngx-translate/core'; import { IxErrorsComponent } from 'app/modules/forms/ix-forms/components/ix-errors/ix-errors.component'; import { IxLabelComponent } from 'app/modules/forms/ix-forms/components/ix-label/ix-label.component'; import { IxFormatterService } from 'app/modules/forms/ix-forms/services/ix-formatter.service'; -import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module'; +import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; import { TestIdModule } from 'app/modules/test-id/test-id.module'; @UntilDestroy() @@ -24,7 +24,7 @@ import { TestIdModule } from 'app/modules/test-id/test-id.module'; IxLabelComponent, TestIdModule, MatTooltip, - IxIconModule, + IxIconComponent, IxErrorsComponent, TranslateModule, ], diff --git a/src/app/modules/forms/ix-forms/components/ix-icon-group/ix-icon-group.component.ts b/src/app/modules/forms/ix-forms/components/ix-icon-group/ix-icon-group.component.ts index e03f9dada70..295aaa590b8 100644 --- a/src/app/modules/forms/ix-forms/components/ix-icon-group/ix-icon-group.component.ts +++ b/src/app/modules/forms/ix-forms/components/ix-icon-group/ix-icon-group.component.ts @@ -8,7 +8,7 @@ import { TranslateModule } from '@ngx-translate/core'; import { IxErrorsComponent } from 'app/modules/forms/ix-forms/components/ix-errors/ix-errors.component'; import { IconGroupOption } from 'app/modules/forms/ix-forms/components/ix-icon-group/icon-group-option.interface'; import { IxLabelComponent } from 'app/modules/forms/ix-forms/components/ix-label/ix-label.component'; -import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module'; +import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; import { TestIdModule } from 'app/modules/test-id/test-id.module'; @UntilDestroy() @@ -22,7 +22,7 @@ import { TestIdModule } from 'app/modules/test-id/test-id.module'; IxLabelComponent, MatIconButton, TestIdModule, - IxIconModule, + IxIconComponent, IxErrorsComponent, TranslateModule, ], diff --git a/src/app/modules/forms/ix-forms/components/ix-input/ix-input.component.ts b/src/app/modules/forms/ix-forms/components/ix-input/ix-input.component.ts index b54a4ec90ab..6d009e39dd9 100644 --- a/src/app/modules/forms/ix-forms/components/ix-input/ix-input.component.ts +++ b/src/app/modules/forms/ix-forms/components/ix-input/ix-input.component.ts @@ -28,7 +28,7 @@ import { IxSimpleChanges } from 'app/interfaces/simple-changes.interface'; import { IxErrorsComponent } from 'app/modules/forms/ix-forms/components/ix-errors/ix-errors.component'; import { IxLabelComponent } from 'app/modules/forms/ix-forms/components/ix-label/ix-label.component'; import { IxFormService } from 'app/modules/forms/ix-forms/services/ix-form.service'; -import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module'; +import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; import { TestIdModule } from 'app/modules/test-id/test-id.module'; @UntilDestroy() @@ -41,7 +41,7 @@ import { TestIdModule } from 'app/modules/test-id/test-id.module'; imports: [ IxLabelComponent, TestIdModule, - IxIconModule, + IxIconComponent, MatInput, MatAutocompleteTrigger, MatIconButton, diff --git a/src/app/modules/forms/ix-forms/components/ix-list/ix-list-item/ix-list-item.component.ts b/src/app/modules/forms/ix-forms/components/ix-list/ix-list-item/ix-list-item.component.ts index d8e8b75eec7..2d6e599d7a1 100644 --- a/src/app/modules/forms/ix-forms/components/ix-list/ix-list-item/ix-list-item.component.ts +++ b/src/app/modules/forms/ix-forms/components/ix-list/ix-list-item/ix-list-item.component.ts @@ -4,7 +4,7 @@ import { } from '@angular/core'; import { MatIconButton } from '@angular/material/button'; import { TranslateModule } from '@ngx-translate/core'; -import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module'; +import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; import { TestIdModule } from 'app/modules/test-id/test-id.module'; @Component({ @@ -16,7 +16,7 @@ import { TestIdModule } from 'app/modules/test-id/test-id.module'; imports: [ MatIconButton, TestIdModule, - IxIconModule, + IxIconComponent, TranslateModule, ], }) diff --git a/src/app/modules/forms/ix-forms/components/ix-select/ix-select.component.ts b/src/app/modules/forms/ix-forms/components/ix-select/ix-select.component.ts index 47970bd1fd6..29ae06871f1 100644 --- a/src/app/modules/forms/ix-forms/components/ix-select/ix-select.component.ts +++ b/src/app/modules/forms/ix-forms/components/ix-select/ix-select.component.ts @@ -16,7 +16,7 @@ import { catchError, debounceTime, tap } from 'rxjs/operators'; import { SelectOption, SelectOptionValueType } from 'app/interfaces/option.interface'; import { IxErrorsComponent } from 'app/modules/forms/ix-forms/components/ix-errors/ix-errors.component'; import { IxLabelComponent } from 'app/modules/forms/ix-forms/components/ix-label/ix-label.component'; -import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module'; +import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; import { TestIdModule } from 'app/modules/test-id/test-id.module'; import { TooltipComponent } from 'app/modules/tooltip/tooltip.component'; @@ -35,7 +35,7 @@ export type IxSelectValue = SelectOptionValueType; MatSelect, FormsModule, MatSelectTrigger, - IxIconModule, + IxIconComponent, MatOption, MatTooltip, TooltipComponent, diff --git a/src/app/modules/forms/ix-forms/components/ix-slide-in/components/ix-modal-header/ix-modal-header.component.ts b/src/app/modules/forms/ix-forms/components/ix-slide-in/components/ix-modal-header/ix-modal-header.component.ts index baeeb8d4a40..c3ad0da3d74 100644 --- a/src/app/modules/forms/ix-forms/components/ix-slide-in/components/ix-modal-header/ix-modal-header.component.ts +++ b/src/app/modules/forms/ix-forms/components/ix-slide-in/components/ix-modal-header/ix-modal-header.component.ts @@ -7,7 +7,7 @@ import { TranslateModule } from '@ngx-translate/core'; import { Role } from 'app/enums/role.enum'; import { IxSlideInRef } from 'app/modules/forms/ix-forms/components/ix-slide-in/ix-slide-in-ref'; import { ReadOnlyComponent } from 'app/modules/forms/ix-forms/components/readonly-badge/readonly-badge.component'; -import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module'; +import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; import { AuthService } from 'app/services/auth/auth.service'; @Component({ @@ -18,7 +18,7 @@ import { AuthService } from 'app/services/auth/auth.service'; standalone: true, imports: [ ReadOnlyComponent, - IxIconModule, + IxIconComponent, MatProgressBar, AsyncPipe, TranslateModule, diff --git a/src/app/modules/forms/ix-forms/components/ix-slide-in/components/ix-modal-header2/ix-modal-header2.component.ts b/src/app/modules/forms/ix-forms/components/ix-slide-in/components/ix-modal-header2/ix-modal-header2.component.ts index ef896aeec09..80478115a13 100644 --- a/src/app/modules/forms/ix-forms/components/ix-slide-in/components/ix-modal-header2/ix-modal-header2.component.ts +++ b/src/app/modules/forms/ix-forms/components/ix-slide-in/components/ix-modal-header2/ix-modal-header2.component.ts @@ -12,7 +12,7 @@ import { Observable } from 'rxjs'; import { Role } from 'app/enums/role.enum'; import { ChainedRef } from 'app/modules/forms/ix-forms/components/ix-slide-in/chained-component-ref'; import { ReadOnlyComponent } from 'app/modules/forms/ix-forms/components/readonly-badge/readonly-badge.component'; -import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module'; +import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; import { TestIdModule } from 'app/modules/test-id/test-id.module'; import { AuthService } from 'app/services/auth/auth.service'; import { IxChainedSlideInService } from 'app/services/ix-chained-slide-in.service'; @@ -28,7 +28,7 @@ import { IxChainedSlideInService } from 'app/services/ix-chained-slide-in.servic MatIconButton, TestIdModule, MatTooltip, - IxIconModule, + IxIconComponent, ReadOnlyComponent, MatProgressBar, AsyncPipe, diff --git a/src/app/modules/forms/ix-forms/components/ix-star-rating/ix-star-rating.component.ts b/src/app/modules/forms/ix-forms/components/ix-star-rating/ix-star-rating.component.ts index 3da116737da..f31a6236ed3 100644 --- a/src/app/modules/forms/ix-forms/components/ix-star-rating/ix-star-rating.component.ts +++ b/src/app/modules/forms/ix-forms/components/ix-star-rating/ix-star-rating.component.ts @@ -7,7 +7,7 @@ import { UntilDestroy } from '@ngneat/until-destroy'; import { TranslateModule } from '@ngx-translate/core'; import { IxErrorsComponent } from 'app/modules/forms/ix-forms/components/ix-errors/ix-errors.component'; import { IxLabelComponent } from 'app/modules/forms/ix-forms/components/ix-label/ix-label.component'; -import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module'; +import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; import { TestIdModule } from 'app/modules/test-id/test-id.module'; @UntilDestroy() @@ -21,7 +21,7 @@ import { TestIdModule } from 'app/modules/test-id/test-id.module'; IxLabelComponent, MatIconButton, TestIdModule, - IxIconModule, + IxIconComponent, IxErrorsComponent, TranslateModule, ], diff --git a/src/app/modules/forms/ix-forms/components/readonly-badge/readonly-badge.component.ts b/src/app/modules/forms/ix-forms/components/readonly-badge/readonly-badge.component.ts index 570061fc0dd..b748956e0d4 100644 --- a/src/app/modules/forms/ix-forms/components/readonly-badge/readonly-badge.component.ts +++ b/src/app/modules/forms/ix-forms/components/readonly-badge/readonly-badge.component.ts @@ -1,6 +1,6 @@ import { ChangeDetectionStrategy, Component } from '@angular/core'; import { TranslateModule } from '@ngx-translate/core'; -import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module'; +import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; @Component({ selector: 'ix-readonly-badge', @@ -8,7 +8,7 @@ import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module'; styleUrls: ['./readonly-badge.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush, standalone: true, - imports: [IxIconModule, TranslateModule], + imports: [IxIconComponent, TranslateModule], }) export class ReadOnlyComponent { diff --git a/src/app/modules/forms/search-input/search-input.module.ts b/src/app/modules/forms/search-input/search-input.module.ts index 5c3412ff53d..6bf5a055ced 100644 --- a/src/app/modules/forms/search-input/search-input.module.ts +++ b/src/app/modules/forms/search-input/search-input.module.ts @@ -12,13 +12,13 @@ import { BasicSearchComponent } from 'app/modules/forms/search-input/components/ import { AdvancedSearchAutocompleteService } from 'app/modules/forms/search-input/services/advanced-search-autocomplete.service'; import { QueryParserService } from 'app/modules/forms/search-input/services/query-parser/query-parser.service'; import { QueryToApiService } from 'app/modules/forms/search-input/services/query-to-api/query-to-api.service'; -import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module'; +import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; import { TestIdModule } from 'app/modules/test-id/test-id.module'; import { SearchInputComponent } from './components/search-input/search-input.component'; @NgModule({ imports: [ - IxIconModule, + IxIconComponent, MatInputModule, TestIdModule, TranslateModule, diff --git a/src/app/modules/forms/search-input1/search-input1.component.ts b/src/app/modules/forms/search-input1/search-input1.component.ts index 0aa7ba07d41..061bbefaf82 100644 --- a/src/app/modules/forms/search-input1/search-input1.component.ts +++ b/src/app/modules/forms/search-input1/search-input1.component.ts @@ -13,7 +13,7 @@ import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy'; import { TranslateModule } from '@ngx-translate/core'; import { debounceTime, distinctUntilChanged, Subject } from 'rxjs'; import { IxSimpleChanges } from 'app/interfaces/simple-changes.interface'; -import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module'; +import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; import { TestIdModule } from 'app/modules/test-id/test-id.module'; /** @@ -27,7 +27,7 @@ import { TestIdModule } from 'app/modules/test-id/test-id.module'; changeDetection: ChangeDetectionStrategy.OnPush, standalone: true, imports: [ - IxIconModule, + IxIconComponent, TranslateModule, MatInputModule, TestIdModule, diff --git a/src/app/modules/global-search/components/global-search/global-search.component.spec.ts b/src/app/modules/global-search/components/global-search/global-search.component.spec.ts index 9e5e0d275ba..c549338a051 100644 --- a/src/app/modules/global-search/components/global-search/global-search.component.spec.ts +++ b/src/app/modules/global-search/components/global-search/global-search.component.spec.ts @@ -19,7 +19,7 @@ import { GlobalSearchSection } from 'app/modules/global-search/enums/global-sear import * as focusHelper from 'app/modules/global-search/helpers/focus-helper'; import { GlobalSearchSectionsProvider } from 'app/modules/global-search/services/global-search-sections.service'; import { UiSearchProvider } from 'app/modules/global-search/services/ui-search.service'; -import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module'; +import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; import { IxSlideInService } from 'app/services/ix-slide-in.service'; import { SidenavService } from 'app/services/sidenav.service'; import { SystemInfoState } from 'app/store/system-info/system-info.reducer'; @@ -43,7 +43,7 @@ describe('GlobalSearchComponent', () => { RouterTestingModule, MatDialogModule, TranslateModule.forRoot(), - IxIconModule, + IxIconComponent, A11yModule, EmptyComponent, ], diff --git a/src/app/modules/global-search/global-search.module.ts b/src/app/modules/global-search/global-search.module.ts index e898c671231..127af77ab4e 100644 --- a/src/app/modules/global-search/global-search.module.ts +++ b/src/app/modules/global-search/global-search.module.ts @@ -11,7 +11,7 @@ import { EmptyComponent } from 'app/modules/empty/empty.component'; import { GlobalSearchComponent } from 'app/modules/global-search/components/global-search/global-search.component'; import { GlobalSearchResultsComponent } from 'app/modules/global-search/components/global-search-results/global-search-results.component'; import { GlobalSearchTriggerComponent } from 'app/modules/global-search/components/global-search-trigger/global-search-trigger.component'; -import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module'; +import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; import { KeyboardShortcutComponent } from 'app/modules/keyboard-shortcut/keyboard-shortcut.component'; import { TestIdModule } from 'app/modules/test-id/test-id.module'; @@ -22,7 +22,7 @@ import { TestIdModule } from 'app/modules/test-id/test-id.module'; GlobalSearchTriggerComponent, ], imports: [ - IxIconModule, + IxIconComponent, MatInputModule, TestIdModule, TranslateModule, diff --git a/src/app/modules/interface-status-icon/interface-status-icon.component.ts b/src/app/modules/interface-status-icon/interface-status-icon.component.ts index 921c5b0c064..9e3fe514b66 100644 --- a/src/app/modules/interface-status-icon/interface-status-icon.component.ts +++ b/src/app/modules/interface-status-icon/interface-status-icon.component.ts @@ -14,7 +14,6 @@ import { LinkState } from 'app/enums/network-interface.enum'; import { buildNormalizedFileSize } from 'app/helpers/file-size.utils'; import { NetworkInterfaceUpdate } from 'app/interfaces/reporting.interface'; import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; -import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module'; @UntilDestroy() @Component({ @@ -25,7 +24,7 @@ import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module'; standalone: true, imports: [ MatTooltipModule, - IxIconModule, + IxIconComponent, ], }) export class InterfaceStatusIconComponent { diff --git a/src/app/modules/ix-icon/ix-icon.component.ts b/src/app/modules/ix-icon/ix-icon.component.ts index 54263d6982d..b17487b1057 100644 --- a/src/app/modules/ix-icon/ix-icon.component.ts +++ b/src/app/modules/ix-icon/ix-icon.component.ts @@ -14,6 +14,7 @@ import { import { MatIcon, MatIconDefaultOptions, MatIconLocation, MatIconRegistry, MAT_ICON_DEFAULT_OPTIONS, MAT_ICON_LOCATION, } from '@angular/material/icon'; +import { IxIconRegistry } from 'app/modules/ix-icon/ix-icon.service'; /** * IxIcon component extends MatIcon @@ -37,6 +38,13 @@ import { // eslint-disable-next-line @angular-eslint/use-component-view-encapsulation encapsulation: ViewEncapsulation.None, changeDetection: ChangeDetectionStrategy.OnPush, + providers: [ + { + provide: MatIconRegistry, + useClass: IxIconRegistry, + }, + ], + standalone: true, }) export class IxIconComponent extends MatIcon implements OnInit, OnChanges, AfterContentInit { readonly name = input(); diff --git a/src/app/modules/ix-icon/ix-icon.module.ts b/src/app/modules/ix-icon/ix-icon.module.ts deleted file mode 100644 index 56379d3fd6e..00000000000 --- a/src/app/modules/ix-icon/ix-icon.module.ts +++ /dev/null @@ -1,18 +0,0 @@ -import { NgModule } from '@angular/core'; -// eslint-disable-next-line no-restricted-imports -import { MatIconModule, MatIconRegistry } from '@angular/material/icon'; -import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; -import { IxIconRegistry } from 'app/modules/ix-icon/ix-icon.service'; - -@NgModule({ - imports: [ - MatIconModule, - ], - declarations: [IxIconComponent], - exports: [IxIconComponent], - providers: [{ - provide: MatIconRegistry, - useClass: IxIconRegistry, - }], -}) -export class IxIconModule {} diff --git a/src/app/modules/ix-table/components/ix-empty-row/ix-empty-row.component.ts b/src/app/modules/ix-table/components/ix-empty-row/ix-empty-row.component.ts index 53994a45f61..c86c2587766 100644 --- a/src/app/modules/ix-table/components/ix-empty-row/ix-empty-row.component.ts +++ b/src/app/modules/ix-table/components/ix-empty-row/ix-empty-row.component.ts @@ -7,7 +7,7 @@ import { MatProgressSpinner } from '@angular/material/progress-spinner'; import { TranslateService, TranslateModule } from '@ngx-translate/core'; import { EmptyType } from 'app/enums/empty-type.enum'; import { EmptyConfig } from 'app/interfaces/empty-config.interface'; -import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module'; +import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; import { TestIdModule } from 'app/modules/test-id/test-id.module'; @Component({ @@ -19,7 +19,7 @@ import { TestIdModule } from 'app/modules/test-id/test-id.module'; imports: [ CdkPortalOutlet, MatProgressSpinner, - IxIconModule, + IxIconComponent, MatButton, TestIdModule, TranslateModule, diff --git a/src/app/modules/ix-table/components/ix-table-body/cells/ix-cell-actions/ix-cell-actions.component.ts b/src/app/modules/ix-table/components/ix-table-body/cells/ix-cell-actions/ix-cell-actions.component.ts index a74b825a388..754cf4ecc5c 100644 --- a/src/app/modules/ix-table/components/ix-table-body/cells/ix-cell-actions/ix-cell-actions.component.ts +++ b/src/app/modules/ix-table/components/ix-table-body/cells/ix-cell-actions/ix-cell-actions.component.ts @@ -4,7 +4,7 @@ import { MatIconButton } from '@angular/material/button'; import { MatTooltip } from '@angular/material/tooltip'; import { RequiresRolesDirective } from 'app/directives/requires-roles/requires-roles.directive'; import { Role } from 'app/enums/role.enum'; -import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module'; +import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; import { IconActionConfig } from 'app/modules/ix-table/components/ix-table-body/cells/ix-cell-actions/icon-action-config.interface'; import { ColumnComponent, Column } from 'app/modules/ix-table/interfaces/column-component.class'; import { TestIdModule } from 'app/modules/test-id/test-id.module'; @@ -20,7 +20,7 @@ import { TestIdModule } from 'app/modules/test-id/test-id.module'; RequiresRolesDirective, MatIconButton, TestIdModule, - IxIconModule, + IxIconComponent, AsyncPipe, ], }) diff --git a/src/app/modules/ix-table/components/ix-table-body/cells/ix-cell-state-button/ix-cell-state-button.component.ts b/src/app/modules/ix-table/components/ix-table-body/cells/ix-cell-state-button/ix-cell-state-button.component.ts index eda4096dd8a..cf90db151f4 100644 --- a/src/app/modules/ix-table/components/ix-table-body/cells/ix-cell-state-button/ix-cell-state-button.component.ts +++ b/src/app/modules/ix-table/components/ix-table-body/cells/ix-cell-state-button/ix-cell-state-button.component.ts @@ -18,7 +18,7 @@ import { ApiJobMethod, ApiJobResponse } from 'app/interfaces/api/api-job-directo import { Job } from 'app/interfaces/job.interface'; import { ShowLogsDialogComponent } from 'app/modules/dialog/components/show-logs-dialog/show-logs-dialog.component'; import { DialogService } from 'app/modules/dialog/dialog.service'; -import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module'; +import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; import { ColumnComponent, Column } from 'app/modules/ix-table/interfaces/column-component.class'; import { JobSlice, selectJob } from 'app/modules/jobs/store/job.selectors'; import { TestIdModule } from 'app/modules/test-id/test-id.module'; @@ -45,7 +45,7 @@ interface RowState { TestIdModule, NgClass, MatTooltip, - IxIconModule, + IxIconComponent, TranslateModule, ], }) diff --git a/src/app/modules/ix-table/components/ix-table-body/ix-table-body.component.ts b/src/app/modules/ix-table/components/ix-table-body/ix-table-body.component.ts index fea24757018..1b3e7424390 100644 --- a/src/app/modules/ix-table/components/ix-table-body/ix-table-body.component.ts +++ b/src/app/modules/ix-table/components/ix-table-body/ix-table-body.component.ts @@ -18,7 +18,7 @@ import { MatTooltip } from '@angular/material/tooltip'; import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy'; import { TranslateModule } from '@ngx-translate/core'; import { UiSearchDirective } from 'app/directives/ui-search.directive'; -import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module'; +import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; import { IxTableBodyCellDirective } from 'app/modules/ix-table/directives/ix-body-cell.directive'; import { IxTableCellDirective } from 'app/modules/ix-table/directives/ix-table-cell.directive'; import { IxTableDetailsRowDirective } from 'app/modules/ix-table/directives/ix-table-details-row.directive'; @@ -42,7 +42,7 @@ import { TestIdModule } from 'app/modules/test-id/test-id.module'; IxTableBodyCellDirective, MatIconButton, MatTooltip, - IxIconModule, + IxIconComponent, MatProgressSpinner, TranslateModule, AsyncPipe, diff --git a/src/app/modules/ix-table/components/ix-table-columns-selector/ix-table-columns-selector.component.ts b/src/app/modules/ix-table/components/ix-table-columns-selector/ix-table-columns-selector.component.ts index c4271b892d1..478d6de7532 100644 --- a/src/app/modules/ix-table/components/ix-table-columns-selector/ix-table-columns-selector.component.ts +++ b/src/app/modules/ix-table/components/ix-table-columns-selector/ix-table-columns-selector.component.ts @@ -8,7 +8,7 @@ import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy'; import { TranslateModule } from '@ngx-translate/core'; import * as _ from 'lodash-es'; import { IxSimpleChanges } from 'app/interfaces/simple-changes.interface'; -import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module'; +import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; import { Column, ColumnComponent } from 'app/modules/ix-table/interfaces/column-component.class'; import { TestIdModule } from 'app/modules/test-id/test-id.module'; @@ -23,7 +23,7 @@ import { TestIdModule } from 'app/modules/test-id/test-id.module'; MatButton, TestIdModule, MatMenuTrigger, - IxIconModule, + IxIconComponent, MatMenu, MatMenuItem, TranslateModule, diff --git a/src/app/modules/ix-table/components/ix-table-head/ix-table-head.component.ts b/src/app/modules/ix-table/components/ix-table-head/ix-table-head.component.ts index 52b3df0b2ee..f81c9ff0b99 100644 --- a/src/app/modules/ix-table/components/ix-table-head/ix-table-head.component.ts +++ b/src/app/modules/ix-table/components/ix-table-head/ix-table-head.component.ts @@ -4,7 +4,7 @@ import { } from '@angular/core'; import { MatTooltip } from '@angular/material/tooltip'; import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy'; -import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module'; +import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; import { IxTableHeaderCellDirective } from 'app/modules/ix-table/directives/ix-header-cell.directive'; import { SortDirection } from 'app/modules/ix-table/enums/sort-direction.enum'; import { Column, ColumnComponent } from 'app/modules/ix-table/interfaces/column-component.class'; @@ -24,7 +24,7 @@ import { TestIdModule } from 'app/modules/test-id/test-id.module'; MatTooltip, NgStyle, IxTableHeaderCellDirective, - IxIconModule, + IxIconComponent, ], }) export class IxTableHeadComponent implements AfterViewInit { diff --git a/src/app/modules/ix-table/components/ix-table-pager/ix-table-pager.component.ts b/src/app/modules/ix-table/components/ix-table-pager/ix-table-pager.component.ts index abb1bd8d5a9..dd2e563e557 100644 --- a/src/app/modules/ix-table/components/ix-table-pager/ix-table-pager.component.ts +++ b/src/app/modules/ix-table/components/ix-table-pager/ix-table-pager.component.ts @@ -7,7 +7,7 @@ import { MatFormField } from '@angular/material/form-field'; import { MatSelectChange, MatSelect } from '@angular/material/select'; import { UntilDestroy } from '@ngneat/until-destroy'; import { TranslateModule } from '@ngx-translate/core'; -import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module'; +import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; import { DataProvider } from 'app/modules/ix-table/interfaces/data-provider.interface'; import { TestIdModule } from 'app/modules/test-id/test-id.module'; @@ -24,7 +24,7 @@ import { TestIdModule } from 'app/modules/test-id/test-id.module'; TestIdModule, MatOption, MatIconButton, - IxIconModule, + IxIconComponent, TranslateModule, ], }) diff --git a/src/app/modules/ix-tree/tree.module.ts b/src/app/modules/ix-tree/tree.module.ts index b460b5ec34d..58c3909b780 100644 --- a/src/app/modules/ix-tree/tree.module.ts +++ b/src/app/modules/ix-tree/tree.module.ts @@ -7,7 +7,7 @@ import { MatTooltipModule } from '@angular/material/tooltip'; import { MatTreeModule } from '@angular/material/tree'; import { TranslateModule } from '@ngx-translate/core'; import { AngularResizeEventModule } from 'angular-resize-event'; -import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module'; +import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; import { NestedTreeNodeComponent } from 'app/modules/ix-tree/components/nested-tree-node/nested-tree-node.component'; import { TreeNodeComponent } from 'app/modules/ix-tree/components/tree-node/tree-node.component'; import { TreeViewComponent } from 'app/modules/ix-tree/components/tree-view/tree-view.component'; @@ -32,7 +32,7 @@ const components = [ @NgModule({ imports: [ CdkTreeModule, - IxIconModule, + IxIconComponent, MatButtonModule, MatTooltipModule, MatTreeModule, diff --git a/src/app/modules/jobs/jobs.module.ts b/src/app/modules/jobs/jobs.module.ts index 9647e939e4f..1f8a04ed523 100644 --- a/src/app/modules/jobs/jobs.module.ts +++ b/src/app/modules/jobs/jobs.module.ts @@ -10,7 +10,7 @@ import { EffectsModule } from '@ngrx/effects'; import { StoreModule } from '@ngrx/store'; import { TranslateModule } from '@ngx-translate/core'; import { LetDirective } from 'app/directives/app-let.directive'; -import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module'; +import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; import { JobItemComponent } from 'app/modules/jobs/components/job-item/job-item.component'; import { JobsPanelComponent } from 'app/modules/jobs/components/jobs-panel/jobs-panel.component'; import { JobEffects } from 'app/modules/jobs/store/job.effects'; @@ -27,7 +27,7 @@ import { TestIdModule } from 'app/modules/test-id/test-id.module'; RouterModule, TranslateModule, MatProgressBarModule, - IxIconModule, + IxIconComponent, MatButtonModule, MatTooltipModule, MatDialogModule, diff --git a/src/app/modules/layout/admin-layout/admin-layout.component.ts b/src/app/modules/layout/admin-layout/admin-layout.component.ts index 8e8f579dbb5..d8ddded5805 100644 --- a/src/app/modules/layout/admin-layout/admin-layout.component.ts +++ b/src/app/modules/layout/admin-layout/admin-layout.component.ts @@ -25,7 +25,7 @@ import { alertPanelClosed } from 'app/modules/alerts/store/alert.actions'; import { selectIsAlertPanelOpen } from 'app/modules/alerts/store/alert.selectors'; import { IxChainedSlideInComponent } from 'app/modules/forms/ix-forms/components/ix-slide-in/components/ix-chained-slide-in/ix-chained-slide-in.component'; import { IxSlideInComponent } from 'app/modules/forms/ix-forms/components/ix-slide-in/ix-slide-in.component'; -import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module'; +import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; import { ConsoleFooterComponent } from 'app/modules/layout/console-footer/console-footer.component'; import { CopyrightLineComponent } from 'app/modules/layout/copyright-line/copyright-line.component'; import { NavigationComponent } from 'app/modules/layout/navigation/navigation.component'; @@ -57,7 +57,7 @@ import { selectBuildYear, waitForSystemInfo } from 'app/store/system-info/system NgClass, RouterLink, TestIdModule, - IxIconModule, + IxIconComponent, NavigationComponent, SecondaryMenuComponent, MatTooltip, diff --git a/src/app/modules/layout/navigation/navigation.component.ts b/src/app/modules/layout/navigation/navigation.component.ts index 7a95ffee15c..95481e72a24 100644 --- a/src/app/modules/layout/navigation/navigation.component.ts +++ b/src/app/modules/layout/navigation/navigation.component.ts @@ -9,7 +9,7 @@ import { RouterLinkActive, RouterLink } from '@angular/router'; import { UntilDestroy } from '@ngneat/until-destroy'; import { TranslateModule } from '@ngx-translate/core'; import { MenuItem, MenuItemType, SubMenuItem } from 'app/interfaces/menu-item.interface'; -import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module'; +import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; import { TestIdModule } from 'app/modules/test-id/test-id.module'; import { NavigationService } from 'app/services/navigation/navigation.service'; @@ -27,7 +27,7 @@ import { NavigationService } from 'app/services/navigation/navigation.service'; TestIdModule, RouterLink, MatTooltip, - IxIconModule, + IxIconComponent, AsyncPipe, TranslateModule, ], diff --git a/src/app/modules/layout/topbar/about-dialog/about-dialog.component.ts b/src/app/modules/layout/topbar/about-dialog/about-dialog.component.ts index f6436d69ea8..e7cc797fffa 100644 --- a/src/app/modules/layout/topbar/about-dialog/about-dialog.component.ts +++ b/src/app/modules/layout/topbar/about-dialog/about-dialog.component.ts @@ -5,7 +5,7 @@ import { TranslateModule } from '@ngx-translate/core'; import { LetDirective } from 'app/directives/app-let.directive'; import { productTypeLabels } from 'app/enums/product-type.enum'; import { helptextAbout } from 'app/helptext/about'; -import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module'; +import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; import { CopyrightLineComponent } from 'app/modules/layout/copyright-line/copyright-line.component'; import { MapValuePipe } from 'app/modules/pipes/map-value/map-value.pipe'; import { TestIdModule } from 'app/modules/test-id/test-id.module'; @@ -18,7 +18,7 @@ import { SystemGeneralService } from 'app/services/system-general.service'; changeDetection: ChangeDetectionStrategy.OnPush, standalone: true, imports: [ - IxIconModule, + IxIconComponent, MatDialogContent, MatDialogActions, CopyrightLineComponent, diff --git a/src/app/modules/layout/topbar/checkin-indicator/checkin-indicator.component.ts b/src/app/modules/layout/topbar/checkin-indicator/checkin-indicator.component.ts index cc13715eb2c..2340705ec45 100644 --- a/src/app/modules/layout/topbar/checkin-indicator/checkin-indicator.component.ts +++ b/src/app/modules/layout/topbar/checkin-indicator/checkin-indicator.component.ts @@ -10,7 +10,7 @@ import { filter } from 'rxjs/operators'; import { helptextInterfaces } from 'app/helptext/network/interfaces/interfaces-list'; import { helptextTopbar } from 'app/helptext/topbar'; import { DialogService } from 'app/modules/dialog/dialog.service'; -import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module'; +import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; import { TestIdModule } from 'app/modules/test-id/test-id.module'; import { AppsState } from 'app/store'; import { checkinIndicatorPressed } from 'app/store/network-interfaces/network-interfaces.actions'; @@ -29,7 +29,7 @@ import { MatIconButton, TestIdModule, MatTooltip, - IxIconModule, + IxIconComponent, AsyncPipe, TranslateModule, ], diff --git a/src/app/modules/layout/topbar/directory-services-indicator/directory-services-indicator.component.ts b/src/app/modules/layout/topbar/directory-services-indicator/directory-services-indicator.component.ts index 3660336516f..6b3f2910879 100644 --- a/src/app/modules/layout/topbar/directory-services-indicator/directory-services-indicator.component.ts +++ b/src/app/modules/layout/topbar/directory-services-indicator/directory-services-indicator.component.ts @@ -10,7 +10,7 @@ import { Subscription } from 'rxjs'; import { DirectoryServiceState } from 'app/enums/directory-service-state.enum'; import { helptextTopbar } from 'app/helptext/topbar'; import { DirectoryServicesState } from 'app/interfaces/directory-services-state.interface'; -import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module'; +import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; import { DirectoryServicesMonitorComponent, } from 'app/modules/layout/topbar/directory-services-indicator/directory-services-monitor/directory-services-monitor.component'; @@ -28,7 +28,7 @@ import { WebSocketService } from 'app/services/ws.service'; MatIconButton, TestIdModule, MatTooltip, - IxIconModule, + IxIconComponent, TranslateModule, ], }) diff --git a/src/app/modules/layout/topbar/directory-services-indicator/directory-services-monitor/directory-services-monitor.component.ts b/src/app/modules/layout/topbar/directory-services-indicator/directory-services-monitor/directory-services-monitor.component.ts index 9cb80e2b2e1..892034fbcf6 100644 --- a/src/app/modules/layout/topbar/directory-services-indicator/directory-services-monitor/directory-services-monitor.component.ts +++ b/src/app/modules/layout/topbar/directory-services-indicator/directory-services-monitor/directory-services-monitor.component.ts @@ -11,7 +11,7 @@ import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy'; import { TranslateModule } from '@ngx-translate/core'; import { finalize } from 'rxjs'; import { DirectoryServiceState, directoryServiceStateLabels } from 'app/enums/directory-service-state.enum'; -import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module'; +import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; import { MapValuePipe } from 'app/modules/pipes/map-value/map-value.pipe'; import { TestIdModule } from 'app/modules/test-id/test-id.module'; import { ErrorHandlerService } from 'app/services/error-handler.service'; @@ -29,7 +29,7 @@ import { WebSocketService } from 'app/services/ws.service'; MatDialogContent, MatIconButton, TestIdModule, - IxIconModule, + IxIconComponent, MatDialogClose, MatProgressSpinner, RouterLink, diff --git a/src/app/modules/layout/topbar/failover-upgrade-indicator/failover-upgrade-indicator.component.ts b/src/app/modules/layout/topbar/failover-upgrade-indicator/failover-upgrade-indicator.component.ts index 16072a5bc5b..778f8aa2058 100644 --- a/src/app/modules/layout/topbar/failover-upgrade-indicator/failover-upgrade-indicator.component.ts +++ b/src/app/modules/layout/topbar/failover-upgrade-indicator/failover-upgrade-indicator.component.ts @@ -6,7 +6,7 @@ import { Store } from '@ngrx/store'; import { TranslateModule } from '@ngx-translate/core'; import { RequiresRolesDirective } from 'app/directives/requires-roles/requires-roles.directive'; import { Role } from 'app/enums/role.enum'; -import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module'; +import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; import { TestIdModule } from 'app/modules/test-id/test-id.module'; import { selectIsUpgradePending } from 'app/store/ha-info/ha-info.selectors'; import { updatePendingIndicatorPressed } from 'app/store/ha-upgrade/ha-upgrade.actions'; @@ -20,7 +20,7 @@ import { updatePendingIndicatorPressed } from 'app/store/ha-upgrade/ha-upgrade.a MatIconButton, TestIdModule, MatTooltip, - IxIconModule, + IxIconComponent, AsyncPipe, TranslateModule, RequiresRolesDirective, diff --git a/src/app/modules/layout/topbar/ha-status-icon/ha-status-icon.component.ts b/src/app/modules/layout/topbar/ha-status-icon/ha-status-icon.component.ts index 2fbda405ede..9d281a5b23c 100644 --- a/src/app/modules/layout/topbar/ha-status-icon/ha-status-icon.component.ts +++ b/src/app/modules/layout/topbar/ha-status-icon/ha-status-icon.component.ts @@ -10,7 +10,7 @@ import { Store } from '@ngrx/store'; import { TranslateService, TranslateModule } from '@ngx-translate/core'; import { filter } from 'rxjs/operators'; import { FailoverDisabledReason } from 'app/enums/failover-disabled-reason.enum'; -import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module'; +import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; import { HaStatusPopoverComponent, } from 'app/modules/layout/topbar/ha-status-icon/ha-status-popover/ha-status-popover.component'; @@ -29,7 +29,7 @@ import { selectHaStatus, selectIsHaLicensed } from 'app/store/ha-info/ha-info.se MatIconButton, TestIdModule, MatTooltip, - IxIconModule, + IxIconComponent, AsyncPipe, TranslateModule, ], diff --git a/src/app/modules/layout/topbar/ha-status-icon/ha-status-popover/ha-status-popover.component.ts b/src/app/modules/layout/topbar/ha-status-icon/ha-status-popover/ha-status-popover.component.ts index 30569f99d0b..7db0ded1e2d 100644 --- a/src/app/modules/layout/topbar/ha-status-icon/ha-status-popover/ha-status-popover.component.ts +++ b/src/app/modules/layout/topbar/ha-status-icon/ha-status-popover/ha-status-popover.component.ts @@ -2,7 +2,7 @@ import { ChangeDetectionStrategy, Component, Inject } from '@angular/core'; import { MAT_DIALOG_DATA } from '@angular/material/dialog'; import { TranslateModule } from '@ngx-translate/core'; import { FailoverDisabledReason, failoverDisabledReasonLabels } from 'app/enums/failover-disabled-reason.enum'; -import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module'; +import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; import { MapValuePipe } from 'app/modules/pipes/map-value/map-value.pipe'; @Component({ @@ -12,7 +12,7 @@ import { MapValuePipe } from 'app/modules/pipes/map-value/map-value.pipe'; changeDetection: ChangeDetectionStrategy.OnPush, standalone: true, imports: [ - IxIconModule, + IxIconComponent, TranslateModule, MapValuePipe, ], diff --git a/src/app/modules/layout/topbar/ix-logo/ix-logo.component.ts b/src/app/modules/layout/topbar/ix-logo/ix-logo.component.ts index d168b57c4cd..1a63814f8c1 100644 --- a/src/app/modules/layout/topbar/ix-logo/ix-logo.component.ts +++ b/src/app/modules/layout/topbar/ix-logo/ix-logo.component.ts @@ -3,7 +3,7 @@ import { AsyncPipe } from '@angular/common'; import { ChangeDetectionStrategy, Component } from '@angular/core'; import { combineLatest } from 'rxjs'; import { map } from 'rxjs/operators'; -import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module'; +import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; import { TestIdModule } from 'app/modules/test-id/test-id.module'; import { ThemeService } from 'app/services/theme/theme.service'; @@ -15,7 +15,7 @@ import { ThemeService } from 'app/services/theme/theme.service'; standalone: true, imports: [ TestIdModule, - IxIconModule, + IxIconComponent, AsyncPipe, ], }) diff --git a/src/app/modules/layout/topbar/jobs-indicator/jobs-indicator.component.ts b/src/app/modules/layout/topbar/jobs-indicator/jobs-indicator.component.ts index daaed6cd654..6ed846f07c8 100644 --- a/src/app/modules/layout/topbar/jobs-indicator/jobs-indicator.component.ts +++ b/src/app/modules/layout/topbar/jobs-indicator/jobs-indicator.component.ts @@ -11,7 +11,7 @@ import { filter } from 'rxjs/operators'; import { LetDirective } from 'app/directives/app-let.directive'; import { UiSearchDirective } from 'app/directives/ui-search.directive'; import { helptextTopbar } from 'app/helptext/topbar'; -import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module'; +import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; import { JobsPanelComponent } from 'app/modules/jobs/components/jobs-panel/jobs-panel.component'; import { jobPanelClosed } from 'app/modules/jobs/store/job.actions'; import { selectIsJobPanelOpen, selectRunningJobsCount } from 'app/modules/jobs/store/job.selectors'; @@ -32,7 +32,7 @@ import { jobIndicatorPressed } from 'app/store/topbar/topbar.actions'; TestIdModule, MatBadge, MatTooltip, - IxIconModule, + IxIconComponent, AsyncPipe, TranslateModule, LetDirective, diff --git a/src/app/modules/layout/topbar/power-menu/power-menu.component.ts b/src/app/modules/layout/topbar/power-menu/power-menu.component.ts index e80a1ea4f40..d37632cf9c6 100644 --- a/src/app/modules/layout/topbar/power-menu/power-menu.component.ts +++ b/src/app/modules/layout/topbar/power-menu/power-menu.component.ts @@ -11,7 +11,7 @@ import { UiSearchDirective } from 'app/directives/ui-search.directive'; import { Role } from 'app/enums/role.enum'; import { helptextTopbar } from 'app/helptext/topbar'; import { DialogService } from 'app/modules/dialog/dialog.service'; -import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module'; +import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; import { powerMenuElements } from 'app/modules/layout/topbar/power-menu/power-menu.elements'; import { TestIdModule } from 'app/modules/test-id/test-id.module'; @@ -26,7 +26,7 @@ import { TestIdModule } from 'app/modules/test-id/test-id.module'; TestIdModule, MatTooltip, MatMenuTrigger, - IxIconModule, + IxIconComponent, MatMenu, MatMenuItem, TranslateModule, diff --git a/src/app/modules/layout/topbar/resilvering-indicator/resilvering-indicator.component.ts b/src/app/modules/layout/topbar/resilvering-indicator/resilvering-indicator.component.ts index 572c5569a94..82e97d0c585 100644 --- a/src/app/modules/layout/topbar/resilvering-indicator/resilvering-indicator.component.ts +++ b/src/app/modules/layout/topbar/resilvering-indicator/resilvering-indicator.component.ts @@ -8,7 +8,7 @@ import { map } from 'rxjs/operators'; import { PoolScanFunction } from 'app/enums/pool-scan-function.enum'; import { PoolScanState } from 'app/enums/pool-scan-state.enum'; import { helptextTopbar } from 'app/helptext/topbar'; -import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module'; +import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; import { ResilverProgressDialogComponent, } from 'app/modules/layout/topbar/resilvering-indicator/resilver-progress/resilver-progress.component'; @@ -25,7 +25,7 @@ import { WebSocketService } from 'app/services/ws.service'; MatIconButton, TestIdModule, MatTooltip, - IxIconModule, + IxIconComponent, AsyncPipe, TranslateModule, ], diff --git a/src/app/modules/layout/topbar/topbar.component.ts b/src/app/modules/layout/topbar/topbar.component.ts index 87b1a0348b5..df642f18820 100644 --- a/src/app/modules/layout/topbar/topbar.component.ts +++ b/src/app/modules/layout/topbar/topbar.component.ts @@ -20,7 +20,7 @@ import { AlertSlice, selectImportantUnreadAlertsCount } from 'app/modules/alerts import { UpdateDialogComponent } from 'app/modules/dialog/components/update-dialog/update-dialog.component'; import { FeedbackDialogComponent } from 'app/modules/feedback/components/feedback-dialog/feedback-dialog.component'; import { GlobalSearchModule } from 'app/modules/global-search/global-search.module'; -import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module'; +import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; import { selectUpdateJob } from 'app/modules/jobs/store/job.selectors'; import { CheckinIndicatorComponent } from 'app/modules/layout/topbar/checkin-indicator/checkin-indicator.component'; import { @@ -56,7 +56,7 @@ import { alertIndicatorPressed, sidenavIndicatorPressed } from 'app/store/topbar MatIconButton, TestIdModule, MatTooltip, - IxIconModule, + IxIconComponent, GlobalSearchModule, RouterLink, IxLogoComponent, diff --git a/src/app/modules/layout/topbar/user-menu/user-menu.component.ts b/src/app/modules/layout/topbar/user-menu/user-menu.component.ts index 6282ab9de0f..7ebc90ec599 100644 --- a/src/app/modules/layout/topbar/user-menu/user-menu.component.ts +++ b/src/app/modules/layout/topbar/user-menu/user-menu.component.ts @@ -14,7 +14,7 @@ import { filter } from 'rxjs'; import { UiSearchDirective } from 'app/directives/ui-search.directive'; import { AccountAttribute } from 'app/enums/account-attribute.enum'; import { helptextTopbar } from 'app/helptext/topbar'; -import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module'; +import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; import { AboutDialogComponent } from 'app/modules/layout/topbar/about-dialog/about-dialog.component'; import { ChangePasswordDialogComponent, @@ -35,7 +35,7 @@ import { AuthService } from 'app/services/auth/auth.service'; TestIdModule, MatTooltip, MatMenuTrigger, - IxIconModule, + IxIconComponent, MatMenu, MatMenuItem, RouterLink, diff --git a/src/app/modules/lists/bulk-list-item/bulk-list-item.component.ts b/src/app/modules/lists/bulk-list-item/bulk-list-item.component.ts index ab2c1302914..a06e4c819cd 100644 --- a/src/app/modules/lists/bulk-list-item/bulk-list-item.component.ts +++ b/src/app/modules/lists/bulk-list-item/bulk-list-item.component.ts @@ -2,7 +2,7 @@ import { ChangeDetectionStrategy, Component, input } from '@angular/core'; import { MatProgressSpinner } from '@angular/material/progress-spinner'; import { MatTooltip } from '@angular/material/tooltip'; import { TranslateModule } from '@ngx-translate/core'; -import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module'; +import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; import { BulkListItem, BulkListItemState, @@ -15,7 +15,7 @@ import { standalone: true, changeDetection: ChangeDetectionStrategy.OnPush, imports: [ - IxIconModule, + IxIconComponent, TranslateModule, MatTooltip, MatProgressSpinner, diff --git a/src/app/modules/lists/dual-list/dual-list.module.ts b/src/app/modules/lists/dual-list/dual-list.module.ts index 95210e4785c..362e0b84d72 100644 --- a/src/app/modules/lists/dual-list/dual-list.module.ts +++ b/src/app/modules/lists/dual-list/dual-list.module.ts @@ -3,7 +3,7 @@ import { NgTemplateOutlet } from '@angular/common'; import { NgModule } from '@angular/core'; import { MatButtonModule } from '@angular/material/button'; import { MatListModule } from '@angular/material/list'; -import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module'; +import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; import { DualListboxComponent } from 'app/modules/lists/dual-list/dual-list.component'; import { TestIdModule } from 'app/modules/test-id/test-id.module'; @@ -12,7 +12,7 @@ import { TestIdModule } from 'app/modules/test-id/test-id.module'; imports: [ MatButtonModule, MatListModule, - IxIconModule, + IxIconComponent, DragDropModule, TestIdModule, NgTemplateOutlet, diff --git a/src/app/modules/lists/ordered-list/ordered-list.module.ts b/src/app/modules/lists/ordered-list/ordered-list.module.ts index 475666e6adc..47b2ea1c3b2 100644 --- a/src/app/modules/lists/ordered-list/ordered-list.module.ts +++ b/src/app/modules/lists/ordered-list/ordered-list.module.ts @@ -6,7 +6,7 @@ import { MatSlideToggleModule } from '@angular/material/slide-toggle'; import { TranslateModule } from '@ngx-translate/core'; import { IxErrorsComponent } from 'app/modules/forms/ix-forms/components/ix-errors/ix-errors.component'; import { IxLabelComponent } from 'app/modules/forms/ix-forms/components/ix-label/ix-label.component'; -import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module'; +import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; import { OrderedListboxComponent } from 'app/modules/lists/ordered-list/ordered-list.component'; import { TestIdModule } from 'app/modules/test-id/test-id.module'; @@ -15,7 +15,7 @@ import { TestIdModule } from 'app/modules/test-id/test-id.module'; imports: [ MatButtonModule, MatListModule, - IxIconModule, + IxIconComponent, DragDropModule, TestIdModule, MatSlideToggleModule, diff --git a/src/app/modules/loader/app-loader.module.ts b/src/app/modules/loader/app-loader.module.ts index c1fa3c89729..22bb5b8f9f9 100644 --- a/src/app/modules/loader/app-loader.module.ts +++ b/src/app/modules/loader/app-loader.module.ts @@ -4,7 +4,7 @@ import { MatProgressBarModule } from '@angular/material/progress-bar'; import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; import { TranslateModule } from '@ngx-translate/core'; import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader'; -import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module'; +import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; import { AppLoaderService } from 'app/modules/loader/app-loader.service'; import { AppLoaderComponent } from 'app/modules/loader/components/app-loader/app-loader.component'; import { FakeProgressBarComponent } from 'app/modules/loader/components/fake-progress-bar/fake-progress-bar.component'; @@ -15,7 +15,7 @@ import { WithLoadingStateLoaderComponent } from './directives/with-loading-state @NgModule({ imports: [ MatDialogModule, - IxIconModule, + IxIconComponent, MatProgressSpinnerModule, TranslateModule, MatProgressBarModule, diff --git a/src/app/modules/scheduler/scheduler.module.ts b/src/app/modules/scheduler/scheduler.module.ts index 3b15be5c27b..25cf20c536a 100644 --- a/src/app/modules/scheduler/scheduler.module.ts +++ b/src/app/modules/scheduler/scheduler.module.ts @@ -12,7 +12,7 @@ import { IxErrorsComponent } from 'app/modules/forms/ix-forms/components/ix-erro import { IxInputComponent } from 'app/modules/forms/ix-forms/components/ix-input/ix-input.component'; import { IxLabelComponent } from 'app/modules/forms/ix-forms/components/ix-label/ix-label.component'; import { IxSelectComponent } from 'app/modules/forms/ix-forms/components/ix-select/ix-select.component'; -import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module'; +import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; import { CastPipe } from 'app/modules/pipes/cast/cast.pipe'; import { IxDateComponent } from 'app/modules/pipes/ix-date/ix-date.component'; import { SchedulerComponent } from 'app/modules/scheduler/components/scheduler/scheduler.component'; @@ -38,7 +38,7 @@ import { TooltipComponent } from 'app/modules/tooltip/tooltip.component'; MatSelectModule, MatDatepickerModule, MatNativeDateModule, - IxIconModule, + IxIconComponent, MatDialogModule, MatButtonModule, MatCheckboxModule, diff --git a/src/app/modules/snackbar/snackbar.module.ts b/src/app/modules/snackbar/snackbar.module.ts index 748cc4e5e60..280ac0cfc58 100644 --- a/src/app/modules/snackbar/snackbar.module.ts +++ b/src/app/modules/snackbar/snackbar.module.ts @@ -2,13 +2,13 @@ import { NgModule } from '@angular/core'; import { MatButtonModule } from '@angular/material/button'; import { MAT_SNACK_BAR_DEFAULT_OPTIONS, MatSnackBarConfig, MatSnackBarModule } from '@angular/material/snack-bar'; import { TranslateModule } from '@ngx-translate/core'; -import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module'; +import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; import { SnackbarComponent } from 'app/modules/snackbar/components/snackbar/snackbar.component'; import { TestIdModule } from 'app/modules/test-id/test-id.module'; @NgModule({ imports: [ - IxIconModule, + IxIconComponent, MatButtonModule, MatSnackBarModule, TranslateModule, diff --git a/src/app/modules/tooltip/tooltip.component.ts b/src/app/modules/tooltip/tooltip.component.ts index dcfc51711e7..a2b46b24706 100644 --- a/src/app/modules/tooltip/tooltip.component.ts +++ b/src/app/modules/tooltip/tooltip.component.ts @@ -3,7 +3,7 @@ import { } from '@angular/core'; import { TranslateModule } from '@ngx-translate/core'; import { NgxPopperjsModule } from 'ngx-popperjs'; -import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module'; +import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; import { CastPipe } from 'app/modules/pipes/cast/cast.pipe'; import { TestIdModule } from 'app/modules/test-id/test-id.module'; @@ -16,7 +16,7 @@ import { TestIdModule } from 'app/modules/test-id/test-id.module'; imports: [ NgxPopperjsModule, TranslateModule, - IxIconModule, + IxIconComponent, TestIdModule, CastPipe, ], diff --git a/src/app/modules/truecommand/truecommand.module.ts b/src/app/modules/truecommand/truecommand.module.ts index 1dba8e5b01c..07ddbf48840 100644 --- a/src/app/modules/truecommand/truecommand.module.ts +++ b/src/app/modules/truecommand/truecommand.module.ts @@ -13,7 +13,7 @@ import { UiSearchDirective } from 'app/directives/ui-search.directive'; import { FormActionsComponent } from 'app/modules/forms/ix-forms/components/form-actions/form-actions.component'; import { IxCheckboxComponent } from 'app/modules/forms/ix-forms/components/ix-checkbox/ix-checkbox.component'; import { IxInputComponent } from 'app/modules/forms/ix-forms/components/ix-input/ix-input.component'; -import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module'; +import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; import { TestIdModule } from 'app/modules/test-id/test-id.module'; import { TruecommandConnectModalComponent } from 'app/modules/truecommand/components/truecommand-connect-modal/truecommand-connect-modal.component'; import { TruecommandStatusModalComponent } from 'app/modules/truecommand/components/truecommand-status-modal/truecommand-status-modal.component'; @@ -33,7 +33,7 @@ import { TruecommandSignupModalComponent } from './components/truecommand-signup imports: [ ReactiveFormsModule, TranslateModule, - IxIconModule, + IxIconComponent, MatBadgeModule, MatDividerModule, MatButtonModule, diff --git a/src/app/pages/account/account.module.ts b/src/app/pages/account/account.module.ts index 534602a438b..2bb734f7013 100644 --- a/src/app/pages/account/account.module.ts +++ b/src/app/pages/account/account.module.ts @@ -6,7 +6,7 @@ import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; import { MatSortModule } from '@angular/material/sort'; import { TranslateModule } from '@ngx-translate/core'; import { EntityModule } from 'app/modules/entity/entity.module'; -import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module'; +import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; import { GroupsModule } from './groups/groups.module'; import { UsersModule } from './users/users.module'; @@ -17,7 +17,7 @@ import { UsersModule } from './users/users.module'; TranslateModule, MatSortModule, MatCardModule, - IxIconModule, + IxIconComponent, MatListModule, MatProgressSpinnerModule, UsersModule, diff --git a/src/app/pages/account/groups/groups.module.ts b/src/app/pages/account/groups/groups.module.ts index dd18ca75f7f..8e8d6a210c7 100644 --- a/src/app/pages/account/groups/groups.module.ts +++ b/src/app/pages/account/groups/groups.module.ts @@ -33,7 +33,7 @@ import { import { ReadOnlyComponent } from 'app/modules/forms/ix-forms/components/readonly-badge/readonly-badge.component'; import { SearchInputModule } from 'app/modules/forms/search-input/search-input.module'; import { SearchInput1Component } from 'app/modules/forms/search-input1/search-input1.component'; -import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module'; +import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; import { IxTableComponent } from 'app/modules/ix-table/components/ix-table/ix-table.component'; import { IxTableBodyComponent } from 'app/modules/ix-table/components/ix-table-body/ix-table-body.component'; import { @@ -64,7 +64,7 @@ import { DeleteGroupDialogComponent } from './group-details-row/delete-group-dia EffectsModule.forFeature([GroupEffects]), EntityModule, MatButtonModule, - IxIconModule, + IxIconComponent, MatListModule, MatMenuModule, MatRippleModule, diff --git a/src/app/pages/account/users/users.module.ts b/src/app/pages/account/users/users.module.ts index fced54e2a0d..ddb1290ce42 100644 --- a/src/app/pages/account/users/users.module.ts +++ b/src/app/pages/account/users/users.module.ts @@ -41,7 +41,7 @@ import { } from 'app/modules/forms/ix-forms/components/ix-slide-toggle/ix-slide-toggle.component'; import { IxTextareaComponent } from 'app/modules/forms/ix-forms/components/ix-textarea/ix-textarea.component'; import { SearchInput1Component } from 'app/modules/forms/search-input1/search-input1.component'; -import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module'; +import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; import { IxTableComponent } from 'app/modules/ix-table/components/ix-table/ix-table.component'; import { IxTableBodyComponent } from 'app/modules/ix-table/components/ix-table-body/ix-table-body.component'; import { @@ -68,7 +68,7 @@ import { UserDetailsRowComponent } from './user-details-row/user-details-row.com EffectsModule.forFeature([UserEffects]), EntityModule, MatButtonModule, - IxIconModule, + IxIconComponent, MatListModule, MatMenuModule, MatRippleModule, diff --git a/src/app/pages/api-keys/api-keys.module.ts b/src/app/pages/api-keys/api-keys.module.ts index 6294907445f..29052aeb431 100644 --- a/src/app/pages/api-keys/api-keys.module.ts +++ b/src/app/pages/api-keys/api-keys.module.ts @@ -16,7 +16,7 @@ import { FormActionsComponent } from 'app/modules/forms/ix-forms/components/form import { IxCheckboxComponent } from 'app/modules/forms/ix-forms/components/ix-checkbox/ix-checkbox.component'; import { IxInputComponent } from 'app/modules/forms/ix-forms/components/ix-input/ix-input.component'; import { SearchInput1Component } from 'app/modules/forms/search-input1/search-input1.component'; -import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module'; +import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; import { IxTableComponent } from 'app/modules/ix-table/components/ix-table/ix-table.component'; import { IxTableBodyComponent } from 'app/modules/ix-table/components/ix-table-body/ix-table-body.component'; import { IxTableHeadComponent } from 'app/modules/ix-table/components/ix-table-head/ix-table-head.component'; @@ -42,7 +42,7 @@ import { ApiKeyComponentStore } from './store/api-key.store'; MatButtonModule, MatCardModule, MatSortModule, - IxIconModule, + IxIconComponent, MatMenuModule, MatTooltipModule, MatDialogModule, diff --git a/src/app/pages/apps/apps.module.ts b/src/app/pages/apps/apps.module.ts index 921f80ffdcc..399094f635f 100644 --- a/src/app/pages/apps/apps.module.ts +++ b/src/app/pages/apps/apps.module.ts @@ -44,7 +44,7 @@ import { import { ReadOnlyComponent } from 'app/modules/forms/ix-forms/components/readonly-badge/readonly-badge.component'; import { SearchInput1Component } from 'app/modules/forms/search-input1/search-input1.component'; import { ToolbarSliderComponent } from 'app/modules/forms/toolbar-slider/toolbar-slider.component'; -import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module'; +import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; import { IxTableComponent } from 'app/modules/ix-table/components/ix-table/ix-table.component'; import { IxTableBodyComponent } from 'app/modules/ix-table/components/ix-table-body/ix-table-body.component'; import { IxTableHeadComponent } from 'app/modules/ix-table/components/ix-table-head/ix-table-head.component'; @@ -171,7 +171,7 @@ import { InstalledAppsComponent } from './components/installed-apps/installed-ap MatMenuModule, ImgFallbackModule, NgxSkeletonLoaderModule, - IxIconModule, + IxIconComponent, LazyLoadImageModule, TestIdModule, AppLoaderModule, diff --git a/src/app/pages/apps/components/installed-apps/app-state-cell/app-state-cell.component.ts b/src/app/pages/apps/components/installed-apps/app-state-cell/app-state-cell.component.ts index a7a9b63c3a3..eff9b140124 100644 --- a/src/app/pages/apps/components/installed-apps/app-state-cell/app-state-cell.component.ts +++ b/src/app/pages/apps/components/installed-apps/app-state-cell/app-state-cell.component.ts @@ -9,7 +9,7 @@ import { TranslateModule } from '@ngx-translate/core'; import { appStateIcons, appStateLabels } from 'app/enums/app-state.enum'; import { App, AppStartQueryParams } from 'app/interfaces/app.interface'; import { Job } from 'app/interfaces/job.interface'; -import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module'; +import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; import { MapValuePipe } from 'app/modules/pipes/map-value/map-value.pipe'; @Component({ @@ -18,7 +18,7 @@ import { MapValuePipe } from 'app/modules/pipes/map-value/map-value.pipe'; styleUrls: ['./app-state-cell.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush, standalone: true, - imports: [TranslateModule, MapValuePipe, MatTooltipModule, IxIconModule], + imports: [TranslateModule, MapValuePipe, MatTooltipModule, IxIconComponent], }) export class AppStateCellComponent { app = input.required(); diff --git a/src/app/pages/apps/components/installed-apps/app-update-cell/app-update-cell.component.ts b/src/app/pages/apps/components/installed-apps/app-update-cell/app-update-cell.component.ts index 3eb338ab76c..a27c7010fa1 100644 --- a/src/app/pages/apps/components/installed-apps/app-update-cell/app-update-cell.component.ts +++ b/src/app/pages/apps/components/installed-apps/app-update-cell/app-update-cell.component.ts @@ -7,7 +7,7 @@ import { import { MatTooltipModule } from '@angular/material/tooltip'; import { TranslateModule } from '@ngx-translate/core'; import { App } from 'app/interfaces/app.interface'; -import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module'; +import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; import { MapValuePipe } from 'app/modules/pipes/map-value/map-value.pipe'; import { AppVersionPipe } from 'app/pages/dashboard/widgets/apps/common/utils/app-version.pipe'; @@ -17,7 +17,7 @@ import { AppVersionPipe } from 'app/pages/dashboard/widgets/apps/common/utils/ap styleUrls: ['./app-update-cell.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush, standalone: true, - imports: [TranslateModule, MapValuePipe, MatTooltipModule, IxIconModule, AppVersionPipe], + imports: [TranslateModule, MapValuePipe, MatTooltipModule, IxIconComponent, AppVersionPipe], }) export class AppUpdateCellComponent { app = input.required(); diff --git a/src/app/pages/apps/modules/custom-forms/custom-forms.module.ts b/src/app/pages/apps/modules/custom-forms/custom-forms.module.ts index dfd99b4f455..14fd3ad90a2 100644 --- a/src/app/pages/apps/modules/custom-forms/custom-forms.module.ts +++ b/src/app/pages/apps/modules/custom-forms/custom-forms.module.ts @@ -2,12 +2,12 @@ import { AsyncPipe } from '@angular/common'; import { NgModule } from '@angular/core'; import { TranslateModule } from '@ngx-translate/core'; import { IxErrorsComponent } from 'app/modules/forms/ix-forms/components/ix-errors/ix-errors.component'; -import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module'; +import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; import { FilterSelectListComponent } from 'app/pages/apps/modules/custom-forms/components/filter-select-list/filter-select-list.component'; @NgModule({ imports: [ - IxIconModule, + IxIconComponent, TranslateModule, IxErrorsComponent, AsyncPipe, diff --git a/src/app/pages/audit/audit.module.ts b/src/app/pages/audit/audit.module.ts index c4abe36b05b..8995feb1fef 100644 --- a/src/app/pages/audit/audit.module.ts +++ b/src/app/pages/audit/audit.module.ts @@ -11,7 +11,7 @@ import { UiSearchDirective } from 'app/directives/ui-search.directive'; import { CopyButtonComponent } from 'app/modules/buttons/copy-button/copy-button.component'; import { ExportButtonComponent } from 'app/modules/buttons/export-button/export-button.component'; import { SearchInputModule } from 'app/modules/forms/search-input/search-input.module'; -import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module'; +import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; import { IxTableComponent } from 'app/modules/ix-table/components/ix-table/ix-table.component'; import { IxTableBodyComponent } from 'app/modules/ix-table/components/ix-table-body/ix-table-body.component'; import { IxTableHeadComponent } from 'app/modules/ix-table/components/ix-table-head/ix-table-head.component'; @@ -33,7 +33,7 @@ import { MetadataDetailsCardComponent } from './components/metadata-details-card TestIdModule, TranslateModule, MatCardModule, - IxIconModule, + IxIconComponent, ReactiveFormsModule, MatSelectModule, AppLoaderModule, diff --git a/src/app/pages/credentials/credentials.module.ts b/src/app/pages/credentials/credentials.module.ts index 8507e3c9621..a7b7c793657 100644 --- a/src/app/pages/credentials/credentials.module.ts +++ b/src/app/pages/credentials/credentials.module.ts @@ -37,7 +37,7 @@ import { IxTextareaComponent } from 'app/modules/forms/ix-forms/components/ix-te import { WithManageCertificatesLinkComponent, } from 'app/modules/forms/ix-forms/components/with-manage-certificates-link/with-manage-certificates-link.component'; -import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module'; +import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; import { IxTableComponent } from 'app/modules/ix-table/components/ix-table/ix-table.component'; import { IxTableBodyComponent } from 'app/modules/ix-table/components/ix-table-body/ix-table-body.component'; import { IxTableHeadComponent } from 'app/modules/ix-table/components/ix-table-head/ix-table-head.component'; @@ -174,7 +174,7 @@ import { CertificateSubjectComponent } from './certificates-dash/forms/common-st imports: [ EntityModule, IxDynamicFormModule, - IxIconModule, + IxIconComponent, MatButtonModule, MatButtonModule, MatCardModule, diff --git a/src/app/pages/dashboard/dashboard.module.ts b/src/app/pages/dashboard/dashboard.module.ts index bd7c36d0598..b5e6b28ac43 100644 --- a/src/app/pages/dashboard/dashboard.module.ts +++ b/src/app/pages/dashboard/dashboard.module.ts @@ -33,7 +33,7 @@ import { } from 'app/modules/forms/ix-forms/components/ix-slide-in/components/ix-modal-header2/ix-modal-header2.component'; import { InterfaceStatusIconComponent } from 'app/modules/interface-status-icon/interface-status-icon.component'; import { IxDropGridModule } from 'app/modules/ix-drop-grid/ix-drop-grid.module'; -import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module'; +import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; import { CopyrightLineComponent } from 'app/modules/layout/copyright-line/copyright-line.component'; import { AppLoaderModule } from 'app/modules/loader/app-loader.module'; import { PageHeaderModule } from 'app/modules/page-header/page-header.module'; @@ -125,7 +125,7 @@ import { PoolUsageGaugeComponent } from './widgets/storage/widget-pool/common/po PageHeaderModule, routing, MatCard, - IxIconModule, + IxIconComponent, MatTooltipModule, BaseChartDirective, MatButtonModule, diff --git a/src/app/pages/data-protection/data-protection.module.ts b/src/app/pages/data-protection/data-protection.module.ts index df994523751..ad75101fe29 100755 --- a/src/app/pages/data-protection/data-protection.module.ts +++ b/src/app/pages/data-protection/data-protection.module.ts @@ -40,7 +40,7 @@ import { } from 'app/modules/forms/ix-forms/components/ix-slide-toggle/ix-slide-toggle.component'; import { IxTextareaComponent } from 'app/modules/forms/ix-forms/components/ix-textarea/ix-textarea.component'; import { SearchInput1Component } from 'app/modules/forms/search-input1/search-input1.component'; -import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module'; +import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; import { IxTableComponent } from 'app/modules/ix-table/components/ix-table/ix-table.component'; import { IxTableBodyComponent } from 'app/modules/ix-table/components/ix-table-body/ix-table-body.component'; import { @@ -144,7 +144,7 @@ import { SmartTaskListComponent } from './smart-task/smart-task-list/smart-task- SchedulerModule, MatButtonModule, MatDialogModule, - IxIconModule, + IxIconComponent, TestIdModule, MatStepperModule, JobsModule, diff --git a/src/app/pages/datasets/datasets.module.ts b/src/app/pages/datasets/datasets.module.ts index b61ed3fdbab..4e1bdac72fe 100644 --- a/src/app/pages/datasets/datasets.module.ts +++ b/src/app/pages/datasets/datasets.module.ts @@ -31,7 +31,7 @@ import { import { IxTextareaComponent } from 'app/modules/forms/ix-forms/components/ix-textarea/ix-textarea.component'; import { IxWarningComponent } from 'app/modules/forms/ix-forms/components/ix-warning/ix-warning.component'; import { SearchInput1Component } from 'app/modules/forms/search-input1/search-input1.component'; -import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module'; +import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; import { IxTableComponent } from 'app/modules/ix-table/components/ix-table/ix-table.component'; import { IxTableBodyComponent } from 'app/modules/ix-table/components/ix-table-body/ix-table-body.component'; import { IxTableHeadComponent } from 'app/modules/ix-table/components/ix-table-head/ix-table-head.component'; @@ -75,7 +75,7 @@ import { DatasetNodeComponent } from './components/dataset-node/dataset-node.com BaseChartDirective, routing, TranslateModule, - IxIconModule, + IxIconComponent, MatCardModule, MatTooltipModule, MatSortModule, diff --git a/src/app/pages/datasets/modules/encryption/encryption.module.ts b/src/app/pages/datasets/modules/encryption/encryption.module.ts index 7fb33814597..04f51851443 100644 --- a/src/app/pages/datasets/modules/encryption/encryption.module.ts +++ b/src/app/pages/datasets/modules/encryption/encryption.module.ts @@ -18,7 +18,7 @@ import { IxListComponent } from 'app/modules/forms/ix-forms/components/ix-list/i import { IxRadioGroupComponent } from 'app/modules/forms/ix-forms/components/ix-radio-group/ix-radio-group.component'; import { IxSelectComponent } from 'app/modules/forms/ix-forms/components/ix-select/ix-select.component'; import { IxTextareaComponent } from 'app/modules/forms/ix-forms/components/ix-textarea/ix-textarea.component'; -import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module'; +import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; import { TestIdModule } from 'app/modules/test-id/test-id.module'; import { DatasetUnlockComponent } from 'app/pages/datasets/modules/encryption/components/dataset-unlock/dataset-unlock.component'; import { @@ -43,7 +43,7 @@ import { LockDatasetDialogComponent } from './components/lock-dataset-dialog/loc ReactiveFormsModule, MatDialogModule, TestIdModule, - IxIconModule, + IxIconComponent, IxCheckboxComponent, IxRadioGroupComponent, IxFileInputComponent, diff --git a/src/app/pages/datasets/modules/permissions/permissions.module.ts b/src/app/pages/datasets/modules/permissions/permissions.module.ts index 135a458166b..4d5e0c7f40b 100644 --- a/src/app/pages/datasets/modules/permissions/permissions.module.ts +++ b/src/app/pages/datasets/modules/permissions/permissions.module.ts @@ -23,7 +23,7 @@ import { IxInputComponent } from 'app/modules/forms/ix-forms/components/ix-input import { IxPermissionsComponent } from 'app/modules/forms/ix-forms/components/ix-permissions/ix-permissions.component'; import { IxRadioGroupComponent } from 'app/modules/forms/ix-forms/components/ix-radio-group/ix-radio-group.component'; import { IxSelectComponent } from 'app/modules/forms/ix-forms/components/ix-select/ix-select.component'; -import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module'; +import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; import { CastPipe } from 'app/modules/pipes/cast/cast.pipe'; import { TestIdModule } from 'app/modules/test-id/test-id.module'; import { @@ -73,7 +73,7 @@ import { StripAclModalComponent } from './components/strip-acl-modal/strip-acl-m ReactiveFormsModule, TranslateModule, MatCardModule, - IxIconModule, + IxIconComponent, MatProgressSpinnerModule, CdkAccordionModule, MatTooltipModule, diff --git a/src/app/pages/datasets/modules/snapshots/snapshots.module.ts b/src/app/pages/datasets/modules/snapshots/snapshots.module.ts index 27e2c049443..adf64ecb38f 100644 --- a/src/app/pages/datasets/modules/snapshots/snapshots.module.ts +++ b/src/app/pages/datasets/modules/snapshots/snapshots.module.ts @@ -33,7 +33,7 @@ import { IxSlideToggleComponent, } from 'app/modules/forms/ix-forms/components/ix-slide-toggle/ix-slide-toggle.component'; import { SearchInput1Component } from 'app/modules/forms/search-input1/search-input1.component'; -import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module'; +import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; import { IxTableComponent } from 'app/modules/ix-table/components/ix-table/ix-table.component'; import { IxTableBodyComponent } from 'app/modules/ix-table/components/ix-table-body/ix-table-body.component'; import { IxTableHeadComponent } from 'app/modules/ix-table/components/ix-table-head/ix-table-head.component'; @@ -69,7 +69,7 @@ const components = [ imports: [ EffectsModule.forFeature([SnapshotEffects]), EntityModule, - IxIconModule, + IxIconComponent, MatButtonModule, MatCardModule, MatCheckboxModule, diff --git a/src/app/pages/directory-service/directory-service.module.ts b/src/app/pages/directory-service/directory-service.module.ts index 448a7522b19..da861e7ee2f 100644 --- a/src/app/pages/directory-service/directory-service.module.ts +++ b/src/app/pages/directory-service/directory-service.module.ts @@ -27,7 +27,7 @@ import { WithManageCertificatesLinkComponent, } from 'app/modules/forms/ix-forms/components/with-manage-certificates-link/with-manage-certificates-link.component'; import { SearchInput1Component } from 'app/modules/forms/search-input1/search-input1.component'; -import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module'; +import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; import { IxTableComponent } from 'app/modules/ix-table/components/ix-table/ix-table.component'; import { IxTableBodyComponent } from 'app/modules/ix-table/components/ix-table-body/ix-table-body.component'; import { IxTableHeadComponent } from 'app/modules/ix-table/components/ix-table-head/ix-table-head.component'; @@ -59,7 +59,7 @@ import { LdapComponent } from './components/ldap/ldap.component'; MatListModule, PageHeaderModule, MatToolbarModule, - IxIconModule, + IxIconComponent, MatButtonModule, MatCardModule, TranslateModule, diff --git a/src/app/pages/jobs/jobs-list.module.ts b/src/app/pages/jobs/jobs-list.module.ts index 4b3a4002dff..bd35d9b6427 100644 --- a/src/app/pages/jobs/jobs-list.module.ts +++ b/src/app/pages/jobs/jobs-list.module.ts @@ -16,7 +16,7 @@ import { UiSearchDirective } from 'app/directives/ui-search.directive'; import { CopyButtonComponent } from 'app/modules/buttons/copy-button/copy-button.component'; import { EntityModule } from 'app/modules/entity/entity.module'; import { SearchInput1Component } from 'app/modules/forms/search-input1/search-input1.component'; -import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module'; +import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; import { IxTableComponent } from 'app/modules/ix-table/components/ix-table/ix-table.component'; import { IxTableBodyComponent } from 'app/modules/ix-table/components/ix-table-body/ix-table-body.component'; import { IxTableHeadComponent } from 'app/modules/ix-table/components/ix-table-head/ix-table-head.component'; @@ -35,7 +35,7 @@ import { JobsListComponent } from './jobs-list/jobs-list.component'; @NgModule({ imports: [ EntityModule, - IxIconModule, + IxIconComponent, MatTooltipModule, MatProgressBarModule, MatProgressSpinnerModule, diff --git a/src/app/pages/network/network.module.ts b/src/app/pages/network/network.module.ts index 1a529071ae2..6e36d152bb0 100644 --- a/src/app/pages/network/network.module.ts +++ b/src/app/pages/network/network.module.ts @@ -31,7 +31,7 @@ import { IxModalHeaderComponent, } from 'app/modules/forms/ix-forms/components/ix-slide-in/components/ix-modal-header/ix-modal-header.component'; import { InterfaceStatusIconComponent } from 'app/modules/interface-status-icon/interface-status-icon.component'; -import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module'; +import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; import { IxTableComponent } from 'app/modules/ix-table/components/ix-table/ix-table.component'; import { IxTableBodyComponent } from 'app/modules/ix-table/components/ix-table-body/ix-table-body.component'; import { IxTableHeadComponent } from 'app/modules/ix-table/components/ix-table-head/ix-table-head.component'; @@ -74,7 +74,7 @@ import { routing } from './network.routing'; routing, MatCardModule, MatListModule, - IxIconModule, + IxIconComponent, MatFormFieldModule, MatInputModule, MatButtonModule, diff --git a/src/app/pages/reports-dashboard/reports-dashboard.module.ts b/src/app/pages/reports-dashboard/reports-dashboard.module.ts index edf97544c5d..a4dfb60f183 100644 --- a/src/app/pages/reports-dashboard/reports-dashboard.module.ts +++ b/src/app/pages/reports-dashboard/reports-dashboard.module.ts @@ -28,7 +28,7 @@ import { IxSlideToggleComponent, } from 'app/modules/forms/ix-forms/components/ix-slide-toggle/ix-slide-toggle.component'; import { SearchInput1Component } from 'app/modules/forms/search-input1/search-input1.component'; -import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module'; +import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; import { IxTableComponent } from 'app/modules/ix-table/components/ix-table/ix-table.component'; import { IxTableBodyComponent } from 'app/modules/ix-table/components/ix-table-body/ix-table-body.component'; import { IxTableHeadComponent } from 'app/modules/ix-table/components/ix-table-head/ix-table-head.component'; @@ -66,7 +66,7 @@ import { ReportsGlobalControlsComponent } from './components/reports-global-cont TranslateModule, EntityModule, MatTooltipModule, - IxIconModule, + IxIconComponent, MatMenuModule, MatCardModule, MatButtonToggleModule, diff --git a/src/app/pages/services/services.module.ts b/src/app/pages/services/services.module.ts index 08f09232c5a..87b77ee9b5a 100644 --- a/src/app/pages/services/services.module.ts +++ b/src/app/pages/services/services.module.ts @@ -32,7 +32,7 @@ import { WithManageCertificatesLinkComponent, } from 'app/modules/forms/ix-forms/components/with-manage-certificates-link/with-manage-certificates-link.component'; import { SearchInput1Component } from 'app/modules/forms/search-input1/search-input1.component'; -import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module'; +import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; import { IxTableComponent } from 'app/modules/ix-table/components/ix-table/ix-table.component'; import { IxTableBodyComponent } from 'app/modules/ix-table/components/ix-table-body/ix-table-body.component'; import { IxTableHeadComponent } from 'app/modules/ix-table/components/ix-table-head/ix-table-head.component'; @@ -60,7 +60,7 @@ import { routing } from './services.routing'; EntityModule, routing, TranslateModule, - IxIconModule, + IxIconComponent, MatTooltipModule, MatSlideToggleModule, MatProgressSpinnerModule, diff --git a/src/app/pages/sharing/sharing.module.ts b/src/app/pages/sharing/sharing.module.ts index 4d4eb42eb07..76c50f73653 100644 --- a/src/app/pages/sharing/sharing.module.ts +++ b/src/app/pages/sharing/sharing.module.ts @@ -39,7 +39,7 @@ import { IxModalHeaderComponent, } from 'app/modules/forms/ix-forms/components/ix-slide-in/components/ix-modal-header/ix-modal-header.component'; import { SearchInput1Component } from 'app/modules/forms/search-input1/search-input1.component'; -import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module'; +import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; import { IxTableComponent } from 'app/modules/ix-table/components/ix-table/ix-table.component'; import { IxTableBodyComponent } from 'app/modules/ix-table/components/ix-table-body/ix-table-body.component'; import { @@ -105,7 +105,7 @@ import { SmbStatusComponent } from './smb/smb-status/smb-status.component'; MatProgressBarModule, MatTabsModule, MatCardModule, - IxIconModule, + IxIconComponent, MatListModule, MatDialogModule, MatMenuModule, diff --git a/src/app/pages/signin/insecure-connection/insecure-connection.component.ts b/src/app/pages/signin/insecure-connection/insecure-connection.component.ts index c45962ba73d..fd2d775a3a6 100644 --- a/src/app/pages/signin/insecure-connection/insecure-connection.component.ts +++ b/src/app/pages/signin/insecure-connection/insecure-connection.component.ts @@ -1,7 +1,7 @@ import { ChangeDetectionStrategy, Component, Inject } from '@angular/core'; import { TranslateService, TranslateModule } from '@ngx-translate/core'; import { WINDOW } from 'app/helpers/window.helper'; -import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module'; +import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; @Component({ selector: 'ix-insecure-connection', @@ -9,7 +9,7 @@ import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module'; styleUrls: ['./insecure-connection.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush, standalone: true, - imports: [IxIconModule, TranslateModule], + imports: [IxIconComponent, TranslateModule], }) export class InsecureConnectionComponent { connectionText = ''; diff --git a/src/app/pages/signin/signin.component.spec.ts b/src/app/pages/signin/signin.component.spec.ts index 9dc0e5910b3..8b93c2edaf3 100644 --- a/src/app/pages/signin/signin.component.spec.ts +++ b/src/app/pages/signin/signin.component.spec.ts @@ -5,7 +5,7 @@ import { BehaviorSubject, of } from 'rxjs'; import { FailoverDisabledReason } from 'app/enums/failover-disabled-reason.enum'; import { FailoverStatus } from 'app/enums/failover-status.enum'; import { DialogService } from 'app/modules/dialog/dialog.service'; -import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module'; +import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; import { CopyrightLineComponent } from 'app/modules/layout/copyright-line/copyright-line.component'; import { DisconnectedMessageComponent, @@ -44,7 +44,7 @@ describe('SigninComponent', () => { component: SigninComponent, imports: [ MatInputModule, - MockModule(IxIconModule), + MockModule(IxIconComponent), ], declarations: [ MockComponents( diff --git a/src/app/pages/signin/signin.component.ts b/src/app/pages/signin/signin.component.ts index bb20ade3c3e..00ba3b0d488 100644 --- a/src/app/pages/signin/signin.component.ts +++ b/src/app/pages/signin/signin.component.ts @@ -17,7 +17,7 @@ import { } from 'rxjs/operators'; import { WINDOW } from 'app/helpers/window.helper'; import { DialogService } from 'app/modules/dialog/dialog.service'; -import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module'; +import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; import { CopyrightLineComponent } from 'app/modules/layout/copyright-line/copyright-line.component'; import { TestIdModule } from 'app/modules/test-id/test-id.module'; import { DisconnectedMessageComponent } from 'app/pages/signin/disconnected-message/disconnected-message.component'; @@ -45,7 +45,7 @@ import { WebSocketConnectionService } from 'app/services/websocket-connection.se MatProgressBar, MatCard, MatCardContent, - IxIconModule, + IxIconComponent, SigninFormComponent, SetAdminPasswordFormComponent, FailoverStatusComponent, diff --git a/src/app/pages/storage/modules/devices/devices.module.ts b/src/app/pages/storage/modules/devices/devices.module.ts index 8d8b7dbc5d0..b3b9793e41e 100644 --- a/src/app/pages/storage/modules/devices/devices.module.ts +++ b/src/app/pages/storage/modules/devices/devices.module.ts @@ -21,7 +21,7 @@ import { FormActionsComponent } from 'app/modules/forms/ix-forms/components/form import { IxCheckboxComponent } from 'app/modules/forms/ix-forms/components/ix-checkbox/ix-checkbox.component'; import { IxInputComponent } from 'app/modules/forms/ix-forms/components/ix-input/ix-input.component'; import { SearchInput1Component } from 'app/modules/forms/search-input1/search-input1.component'; -import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module'; +import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; import { TreeModule } from 'app/modules/ix-tree/tree.module'; import { AppLoaderModule } from 'app/modules/loader/app-loader.module'; import { PageHeaderModule } from 'app/modules/page-header/page-header.module'; @@ -62,7 +62,7 @@ import { ExtendDialogComponent } from './components/zfs-info-card/extend-dialog/ MatButtonModule, MatCardModule, MatDialogModule, - IxIconModule, + IxIconComponent, NgxSkeletonLoaderModule.forRoot({ theme: { 'background-color': 'var(--alt-bg2)', diff --git a/src/app/pages/storage/modules/disks/disks.module.ts b/src/app/pages/storage/modules/disks/disks.module.ts index 1fc9a447bf8..e7a8aadcbe8 100644 --- a/src/app/pages/storage/modules/disks/disks.module.ts +++ b/src/app/pages/storage/modules/disks/disks.module.ts @@ -23,7 +23,7 @@ import { } from 'app/modules/forms/ix-forms/components/ix-slide-in/components/ix-modal-header/ix-modal-header.component'; import { IxWarningComponent } from 'app/modules/forms/ix-forms/components/ix-warning/ix-warning.component'; import { SearchInput1Component } from 'app/modules/forms/search-input1/search-input1.component'; -import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module'; +import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; import { IxTableComponent } from 'app/modules/ix-table/components/ix-table/ix-table.component'; import { IxTableBodyComponent } from 'app/modules/ix-table/components/ix-table-body/ix-table-body.component'; import { @@ -65,7 +65,7 @@ import { routes } from 'app/pages/storage/modules/disks/disks.routing'; MatDividerModule, MatProgressBarModule, TestIdModule, - IxIconModule, + IxIconComponent, PageHeaderModule, SearchInput1Component, UnusedDiskSelectComponent, diff --git a/src/app/pages/storage/modules/pool-manager/pool-manager.module.ts b/src/app/pages/storage/modules/pool-manager/pool-manager.module.ts index 51a9010b7c1..98a5d9a77ce 100644 --- a/src/app/pages/storage/modules/pool-manager/pool-manager.module.ts +++ b/src/app/pages/storage/modules/pool-manager/pool-manager.module.ts @@ -26,7 +26,7 @@ import { IxLabelComponent } from 'app/modules/forms/ix-forms/components/ix-label import { IxRadioGroupComponent } from 'app/modules/forms/ix-forms/components/ix-radio-group/ix-radio-group.component'; import { IxSelectComponent } from 'app/modules/forms/ix-forms/components/ix-select/ix-select.component'; import { IxWarningComponent } from 'app/modules/forms/ix-forms/components/ix-warning/ix-warning.component'; -import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module'; +import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; import { TreeModule } from 'app/modules/ix-tree/tree.module'; import { AppLoaderModule } from 'app/modules/loader/app-loader.module'; import { CastPipe } from 'app/modules/pipes/cast/cast.pipe'; @@ -78,14 +78,14 @@ import { DataWizardStepComponent } from './components/pool-manager-wizard/steps/ @NgModule({ imports: [ - IxIconModule, + IxIconComponent, MatButtonModule, MatCardModule, MatDialogModule, MatStepperModule, MatDividerModule, TreeModule, - IxIconModule, + IxIconComponent, ReactiveFormsModule, DndModule, RouterModule.forChild(routes), diff --git a/src/app/pages/storage/storage.module.ts b/src/app/pages/storage/storage.module.ts index d3640313f2e..1b30e6fc6a3 100644 --- a/src/app/pages/storage/storage.module.ts +++ b/src/app/pages/storage/storage.module.ts @@ -36,7 +36,7 @@ import { IxModalHeaderComponent, } from 'app/modules/forms/ix-forms/components/ix-slide-in/components/ix-modal-header/ix-modal-header.component'; import { IxWarningComponent } from 'app/modules/forms/ix-forms/components/ix-warning/ix-warning.component'; -import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module'; +import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; import { AppLoaderModule } from 'app/modules/loader/app-loader.module'; import { PageHeaderModule } from 'app/modules/page-header/page-header.module'; import { FileSizePipe } from 'app/modules/pipes/file-size/file-size.pipe'; @@ -73,7 +73,7 @@ import { ZfsHealthCardComponent } from './components/dashboard-pool/zfs-health-c MatButtonModule, RouterModule, MatPaginatorModule, - IxIconModule, + IxIconComponent, MatProgressSpinnerModule, MatToolbarModule, BaseChartDirective, diff --git a/src/app/pages/system-tasks/system-tasks.module.ts b/src/app/pages/system-tasks/system-tasks.module.ts index d886f8081c3..8d9a63f1caf 100644 --- a/src/app/pages/system-tasks/system-tasks.module.ts +++ b/src/app/pages/system-tasks/system-tasks.module.ts @@ -7,7 +7,7 @@ import { MatMenuModule } from '@angular/material/menu'; import { MatSlideToggleModule } from '@angular/material/slide-toggle'; import { RouterModule } from '@angular/router'; import { TranslateModule } from '@ngx-translate/core'; -import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module'; +import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; import { CopyrightLineComponent } from 'app/modules/layout/copyright-line/copyright-line.component'; import { ConfigResetComponent } from 'app/pages/system-tasks/config-reset/config-reset.component'; import { FailoverComponent } from 'app/pages/system-tasks/failover/failover.component'; @@ -18,7 +18,7 @@ import { systemTasksRoutes } from 'app/pages/system-tasks/system-tasks.routing'; @NgModule({ imports: [ MatListModule, - IxIconModule, + IxIconComponent, MatButtonModule, MatCardModule, MatMenuModule, diff --git a/src/app/pages/system/enclosure/enclosure.module.ts b/src/app/pages/system/enclosure/enclosure.module.ts index 6ad79c0d9e4..4b9d4438157 100644 --- a/src/app/pages/system/enclosure/enclosure.module.ts +++ b/src/app/pages/system/enclosure/enclosure.module.ts @@ -20,7 +20,7 @@ import { IxModalHeaderComponent, } from 'app/modules/forms/ix-forms/components/ix-slide-in/components/ix-modal-header/ix-modal-header.component'; import { SearchInput1Component } from 'app/modules/forms/search-input1/search-input1.component'; -import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module'; +import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; import { IxTableComponent } from 'app/modules/ix-table/components/ix-table/ix-table.component'; import { IxTableBodyComponent } from 'app/modules/ix-table/components/ix-table-body/ix-table-body.component'; import { IxTableHeadComponent } from 'app/modules/ix-table/components/ix-table-head/ix-table-head.component'; @@ -118,7 +118,7 @@ import { SvgCacheService } from 'app/pages/system/enclosure/services/svg-cache.s MatCardModule, MatButtonModule, TranslateModule, - IxIconModule, + IxIconComponent, MatMenu, MatMenuItem, MatMenuTrigger, diff --git a/src/app/pages/system/system.module.ts b/src/app/pages/system/system.module.ts index 4b794674a01..a9a27df920a 100644 --- a/src/app/pages/system/system.module.ts +++ b/src/app/pages/system/system.module.ts @@ -52,7 +52,7 @@ import { WithManageCertificatesLinkComponent, } from 'app/modules/forms/ix-forms/components/with-manage-certificates-link/with-manage-certificates-link.component'; import { SearchInput1Component } from 'app/modules/forms/search-input1/search-input1.component'; -import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module'; +import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; import { IxTableComponent } from 'app/modules/ix-table/components/ix-table/ix-table.component'; import { IxTableBodyComponent } from 'app/modules/ix-table/components/ix-table-body/ix-table-body.component'; import { @@ -191,7 +191,7 @@ import { routing } from './system.routing'; SchedulerModule, JobsModule, MatCardModule, - IxIconModule, + IxIconComponent, MatSelectModule, MatProgressSpinnerModule, MatProgressBarModule, diff --git a/src/app/pages/vm/vm.module.ts b/src/app/pages/vm/vm.module.ts index 96566c652b1..9b37fd3be66 100644 --- a/src/app/pages/vm/vm.module.ts +++ b/src/app/pages/vm/vm.module.ts @@ -29,7 +29,7 @@ import { IxModalHeaderComponent, } from 'app/modules/forms/ix-forms/components/ix-slide-in/components/ix-modal-header/ix-modal-header.component'; import { SearchInput1Component } from 'app/modules/forms/search-input1/search-input1.component'; -import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module'; +import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; import { IxTableComponent } from 'app/modules/ix-table/components/ix-table/ix-table.component'; import { IxTableBodyComponent } from 'app/modules/ix-table/components/ix-table-body/ix-table-body.component'; import { @@ -74,7 +74,7 @@ import { routing } from './vm.routing'; imports: [ AppLoaderModule, EntityModule, - IxIconModule, + IxIconComponent, MatButtonModule, MatCardModule, MatDialogModule, diff --git a/src/setup-jest.ts b/src/setup-jest.ts index 8f8781b7e5f..c98085b7c8c 100644 --- a/src/setup-jest.ts +++ b/src/setup-jest.ts @@ -72,7 +72,7 @@ import { import { IxTextareaComponent } from 'app/modules/forms/ix-forms/components/ix-textarea/ix-textarea.component'; import { IxWarningComponent } from 'app/modules/forms/ix-forms/components/ix-warning/ix-warning.component'; import { IxIconTestingModule } from 'app/modules/ix-icon/ix-icon-testing.module'; -import { IxIconModule } from 'app/modules/ix-icon/ix-icon.module'; +import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; import { IxTableComponent } from 'app/modules/ix-table/components/ix-table/ix-table.component'; import { IxTableBodyComponent } from 'app/modules/ix-table/components/ix-table-body/ix-table-body.component'; import { IxTableHeadComponent } from 'app/modules/ix-table/components/ix-table-head/ix-table-head.component'; @@ -96,7 +96,7 @@ defineGlobalsInjections({ MatCheckboxModule, MatSlideToggleModule, MatMenuModule, - IxIconModule, + IxIconComponent, IxIconTestingModule, MatDatepickerModule, MatNativeDateModule, From 3de3c4a8527ce4d270a1aa9c9fcc973f10c637b0 Mon Sep 17 00:00:00 2001 From: Evgeny Stepanovych Date: Mon, 23 Sep 2024 20:54:18 +0200 Subject: [PATCH 2/5] NAS-131364: Migrate more components to standalone --- src/app/app.module.ts | 4 -- ...new-feature-indicator-wrapper.component.ts | 4 +- src/app/modules/alerts/alerts.module.ts | 4 +- .../copy-button/copy-button.component.ts | 4 +- .../export-button/export-button.component.ts | 4 +- .../oauth-button/oauth-button.module.ts | 4 +- .../confirm-dialog.component.ts | 4 +- .../error-dialog/error-dialog.component.ts | 4 +- .../full-screen-dialog.component.ts | 4 +- .../general-dialog.component.ts | 4 +- .../info-dialog/info-dialog.component.ts | 4 +- .../job-progress-dialog.component.ts | 5 +- .../error-template.component.ts | 4 +- .../multi-error-dialog.component.ts | 4 +- .../redirect-dialog.component.ts | 4 +- .../session-expiring-dialog.component.ts | 4 +- .../show-logs-dialog.component.ts | 4 +- .../start-service-dialog.component.ts | 8 +-- .../update-dialog/update-dialog.component.ts | 4 +- src/app/modules/empty/empty.component.ts | 4 +- src/app/modules/entity/entity.module.ts | 4 +- src/app/modules/feedback/feedback.module.ts | 8 +-- .../ix-button-group.component.ts | 6 +- .../ix-checkbox-list.component.ts | 4 +- .../ix-checkbox/ix-checkbox.component.ts | 4 +- .../components/ix-chips/ix-chips.component.ts | 6 +- .../ix-code-editor.component.ts | 4 +- .../ix-combobox/ix-combobox.component.ts | 6 +- .../create-dataset-dialog.component.ts | 4 +- .../ix-explorer/ix-explorer.component.ts | 6 +- .../ix-file-input/ix-file-input.component.ts | 6 +- .../ix-icon-group/ix-icon-group.component.ts | 4 +- .../components/ix-input/ix-input.component.ts | 6 +- .../ix-ip-input-with-netmask.component.ts | 6 +- .../ix-list-item/ix-list-item.component.ts | 4 +- .../components/ix-list/ix-list.component.ts | 4 +- .../ix-permissions.component.ts | 6 +- .../ix-radio-group.component.ts | 6 +- .../ix-select/ix-select.component.ts | 6 +- .../ix-modal-header2.component.ts | 4 +- .../ix-slide-toggle.component.ts | 4 +- .../ix-star-rating.component.ts | 4 +- .../ix-textarea/ix-textarea.component.ts | 6 +- ...with-manage-certificates-link.component.ts | 4 +- .../forms/search-input/search-input.module.ts | 4 +- .../search-input1/search-input1.component.ts | 4 +- .../toolbar-slider.component.ts | 4 +- .../global-search/global-search.module.ts | 4 +- .../ix-empty-row/ix-empty-row.component.ts | 4 +- .../ix-cell-actions.component.ts | 4 +- .../ix-cell-checkbox.component.ts | 4 +- .../ix-cell-date/ix-cell-date.component.ts | 4 +- .../ix-cell-relative-date.component.ts | 4 +- .../ix-cell-schedule.component.ts | 4 +- .../ix-cell-size/ix-cell-size.component.ts | 4 +- .../ix-cell-state-button.component.ts | 4 +- .../ix-cell-text/ix-cell-text.component.ts | 4 +- .../ix-cell-toggle.component.ts | 4 +- .../ix-cell-yes-no.component.ts | 4 +- .../ix-table-body/ix-table-body.component.ts | 4 +- .../ix-table-columns-selector.component.ts | 4 +- .../ix-header-cell-checkbox.component.ts | 4 +- .../ix-table-head/ix-table-head.component.ts | 4 +- .../ix-table-pager-show-more.component.ts | 4 +- .../ix-table-pager.component.ts | 4 +- .../components/ix-table/ix-table.component.ts | 6 +- src/app/modules/ix-tree/tree.module.ts | 4 +- .../components/job-item/job-item.component.ts | 21 ++++++ .../jobs-panel/jobs-panel.component.ts | 28 +++++++- src/app/modules/jobs/jobs.module.ts | 45 ------------ .../admin-layout/admin-layout.component.ts | 4 +- .../console-panel-dialog.component.ts | 4 +- .../copyright-line.component.ts | 4 +- .../layout/navigation/navigation.component.ts | 4 +- .../secondary-menu.component.ts | 4 +- .../about-dialog/about-dialog.component.ts | 4 +- .../change-password-dialog.component.spec.ts | 2 - .../change-password-dialog.component.ts | 4 +- .../checkin-indicator.component.ts | 4 +- .../directory-services-indicator.component.ts | 4 +- .../directory-services-monitor.component.ts | 4 +- .../failover-upgrade-indicator.component.ts | 4 +- .../ha-status-icon.component.ts | 4 +- .../topbar/ix-logo/ix-logo.component.ts | 4 +- .../jobs-indicator.component.ts | 4 +- .../topbar/power-menu/power-menu.component.ts | 4 +- .../resilver-progress.component.ts | 4 +- .../resilvering-indicator.component.ts | 4 +- .../modules/layout/topbar/topbar.component.ts | 4 +- .../topbar/user-menu/user-menu.component.ts | 4 +- .../lists/dual-list/dual-list.module.ts | 4 +- .../lists/ordered-list/ordered-list.module.ts | 4 +- src/app/modules/loader/app-loader.module.ts | 38 ----------- .../app-loader/app-loader.component.ts | 11 +++ .../fake-progress-bar.component.ts | 3 + .../with-loading-state-error.component.ts | 3 + .../with-loading-state-loader.component.ts | 3 + .../with-loading-state.directive.ts | 1 + .../modules/page-header/page-header.module.ts | 8 +-- src/app/modules/scheduler/scheduler.module.ts | 4 +- src/app/modules/snackbar/snackbar.module.ts | 4 +- src/app/modules/summary/summary.component.ts | 4 +- src/app/modules/terminal/terminal.module.ts | 4 +- src/app/modules/test-id/test-id.module.ts | 15 ---- .../test-override/test-override.directive.ts | 1 + .../test-id/{test => }/test.directive.ts | 1 + src/app/modules/tooltip/tooltip.component.ts | 4 +- .../modules/truecommand/truecommand.module.ts | 4 +- .../delete-group-dialog.component.spec.ts | 2 - src/app/pages/account/groups/groups.module.ts | 4 +- .../delete-user-dialog.component.spec.ts | 2 - src/app/pages/account/users/users.module.ts | 6 +- src/app/pages/api-keys/api-keys.module.ts | 4 +- .../api-key-list.component.spec.ts | 2 - src/app/pages/apps/apps.module.ts | 8 +-- ...cker-image-delete-dialog.component.spec.ts | 2 - .../app-bulk-upgrade.component.spec.ts | 2 - .../shell-details-dialog.component.spec.ts | 2 - src/app/pages/audit/audit.module.ts | 8 +-- .../ssh-connection-form.component.spec.ts | 2 - .../sign-csr-dialog.component.spec.ts | 2 - .../pages/credentials/credentials.module.ts | 4 +- .../widget-group-form.component.spec.ts | 1 - src/app/pages/dashboard/dashboard.module.ts | 10 +-- .../cloud-backup-card.component.spec.ts | 2 - .../cloud-backup-list.component.spec.ts | 2 - .../cloudsync-list.component.spec.ts | 2 - ...cloudsync-restore-dialog.component.spec.ts | 2 - .../cloudsync-task-card.component.spec.ts | 2 - .../data-protection/data-protection.module.ts | 6 +- .../replication-list.component.spec.ts | 2 - ...plication-restore-dialog.component.spec.ts | 2 - .../replication-task-card.component.spec.ts | 2 - .../rsync-task-card.component.spec.ts | 2 - .../scrub-task-card.component.spec.ts | 2 - .../smart-task-card.component.spec.ts | 2 - .../smart-task-list.component.spec.ts | 2 - .../snapshot-task-card.component.spec.ts | 2 - .../snapshot-task-list.component.spec.ts | 2 - .../delete-dataset-dialog.component.spec.ts | 2 - src/app/pages/datasets/datasets.module.ts | 8 +-- ...ncryption-options-dialog.component.spec.ts | 2 - .../export-all-keys-dialog.component.spec.ts | 2 - ...xport-dataset-key-dialog.component.spec.ts | 2 - .../modules/encryption/encryption.module.ts | 4 +- .../save-as-preset-modal.component.spec.ts | 2 - .../select-preset-modal.component.spec.ts | 2 - .../modules/permissions/permissions.module.ts | 4 +- ...shot-batch-delete-dialog.component.spec.ts | 2 - .../snapshot-clone-dialog.component.spec.ts | 2 - .../snapshot-details-row.component.spec.ts | 2 - ...snapshot-rollback-dialog.component.spec.ts | 2 - .../modules/snapshots/snapshots.module.ts | 4 +- .../leave-domain-dialog.component.spec.ts | 2 - .../directory-service.module.ts | 4 +- src/app/pages/jobs/jobs-list.module.ts | 4 +- src/app/pages/network/network.module.ts | 12 ++-- .../reports-dashboard.module.ts | 8 +-- .../add-spn-dialog.component.spec.ts | 2 - src/app/pages/services/services.module.ts | 4 +- .../iscsi-card/iscsi-card.component.spec.ts | 2 - .../smb-card/smb-card.component.spec.ts | 2 - .../associated-target-list.component.spec.ts | 2 - .../extent-list/extent-list.component.spec.ts | 2 - .../initiator-list.component.spec.ts | 2 - .../portal-list/portal-list.component.spec.ts | 2 - .../target-list/target-list.component.spec.ts | 2 - .../nfs/nfs-list/nfs-list.component.spec.ts | 2 - .../nfs-session-list.component.spec.ts | 2 - src/app/pages/sharing/sharing.module.ts | 13 ++-- .../smb-lock-list.component.spec.ts | 2 - .../smb-notification-list.component.spec.ts | 2 - .../smb-session-list.component.spec.ts | 2 - .../smb-share-list.component.spec.ts | 2 - .../set-admin-password-form.component.ts | 4 +- .../signin-form/signin-form.component.ts | 4 +- src/app/pages/signin/signin.component.ts | 4 +- .../export-disconnect-modal.component.spec.ts | 2 - .../autotrim-dialog.component.spec.ts | 2 - .../manage-disk-sed-dialog.component.spec.ts | 2 - .../storage/modules/devices/devices.module.ts | 22 ++++-- .../smart-test-result-list.component.spec.ts | 2 - .../storage/modules/disks/disks.module.ts | 11 ++- .../pool-manager/pool-manager.module.ts | 14 ++-- src/app/pages/storage/storage.module.ts | 31 +++++++-- .../access-card/access-card.component.spec.ts | 2 - .../cron-card/cron-card.component.spec.ts | 2 - .../cron-list/cron-list.component.spec.ts | 2 - .../init-shutdown-card.component.spec.ts | 2 - .../sysctl-card/sysctl-card.component.spec.ts | 2 - .../boot-pool-delete-dialog.component.spec.ts | 2 - .../bootenv-list.component.spec.ts | 2 - .../bootenv-stats-dialog.component.spec.ts | 2 - .../bootenv-status.component.spec.ts | 2 - .../system/enclosure/enclosure.module.ts | 12 ++-- .../gui/gui-form/gui-form.component.spec.ts | 2 - .../save-config-dialog.component.spec.ts | 2 - .../upload-config-dialog.component.spec.ts | 2 - src/app/pages/system/system.module.ts | 68 +++++++++++++++++-- .../two-factor-auth/two-factor-auth.module.ts | 6 +- .../vm/vm-list/vm-list.component.spec.ts | 2 - src/app/pages/vm/vm.module.ts | 10 +-- src/app/services/vm.service.spec.ts | 2 - src/app/store/index.ts | 6 ++ src/setup-jest.ts | 8 +-- tsconfig.strictNullChecks.json | 3 +- 206 files changed, 509 insertions(+), 529 deletions(-) delete mode 100644 src/app/modules/jobs/jobs.module.ts delete mode 100644 src/app/modules/loader/app-loader.module.ts delete mode 100644 src/app/modules/test-id/test-id.module.ts rename src/app/modules/test-id/{test => }/test.directive.ts (99%) diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 2bb970ef3e5..49b86336a0d 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -30,7 +30,6 @@ import { MockEnclosureWebsocketService } from 'app/core/testing/mock-enclosure/m import { getWindow, WINDOW } from 'app/helpers/window.helper'; import { FeedbackModule } from 'app/modules/feedback/feedback.module'; import { SnackbarModule } from 'app/modules/snackbar/snackbar.module'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; import { TwoFactorGuardService } from 'app/services/auth/two-factor-guard.service'; import { ErrorHandlerService } from 'app/services/error-handler.service'; import { NavigationService } from 'app/services/navigation/navigation.service'; @@ -39,7 +38,6 @@ import { WebSocketService } from 'app/services/ws.service'; import { rootEffects, rootReducers } from 'app/store'; import { CustomRouterStateSerializer } from 'app/store/router/custom-router-serializer'; import { AppComponent } from './app.component'; -import { AppLoaderModule } from './modules/loader/app-loader.module'; import { AuthGuardService } from './services/auth/auth-guard.service'; @NgModule({ @@ -52,7 +50,6 @@ import { AuthGuardService } from './services/auth/auth-guard.service'; imports: [ BrowserModule, BrowserAnimationsModule, - AppLoaderModule, MatNativeDateModule, MatNativeDateModule, TranslateModule.forRoot({ @@ -107,7 +104,6 @@ import { AuthGuardService } from './services/auth/auth-guard.service'; }, }), MatButtonModule, - TestIdModule, MarkdownModule.forRoot({ loader: HttpClient }), FeedbackModule, ], diff --git a/src/app/directives/new-feature-indicator/new-feature-indicator-wrapper.component.ts b/src/app/directives/new-feature-indicator/new-feature-indicator-wrapper.component.ts index 7d9fb0019de..7004dd2c5d8 100644 --- a/src/app/directives/new-feature-indicator/new-feature-indicator-wrapper.component.ts +++ b/src/app/directives/new-feature-indicator/new-feature-indicator-wrapper.component.ts @@ -10,7 +10,7 @@ import { NewFeatureIndicator } from 'app/directives/new-feature-indicator/new-fe import { NewFeatureIndicatorService } from 'app/directives/new-feature-indicator/new-feature-indicator.service'; import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; import { CastPipe } from 'app/modules/pipes/cast/cast.pipe'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestDirective } from 'app/modules/test-id/test.directive'; @Component({ selector: 'ix-new-feature-indicator-wrapper', @@ -28,10 +28,10 @@ import { TestIdModule } from 'app/modules/test-id/test-id.module'; standalone: true, imports: [ NgxPopperjsModule, - TestIdModule, NgTemplateOutlet, IxIconComponent, CastPipe, + TestDirective, ], }) export class NewFeatureIndicatorWrapperComponent { diff --git a/src/app/modules/alerts/alerts.module.ts b/src/app/modules/alerts/alerts.module.ts index c869408e904..ccaa247bd49 100644 --- a/src/app/modules/alerts/alerts.module.ts +++ b/src/app/modules/alerts/alerts.module.ts @@ -20,7 +20,7 @@ import { alertReducer } from 'app/modules/alerts/store/alert.reducer'; import { alertStateKey } from 'app/modules/alerts/store/alert.selectors'; import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; import { FormatDateTimePipe } from 'app/modules/pipes/format-date-time/format-datetime.pipe'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestDirective } from 'app/modules/test-id/test.directive'; @NgModule({ imports: [ @@ -36,11 +36,11 @@ import { TestIdModule } from 'app/modules/test-id/test-id.module'; MatListModule, MatTooltipModule, MatRippleModule, - TestIdModule, FormatDateTimePipe, AsyncPipe, NavigateAndInteractDirective, LetDirective, + TestDirective, ], declarations: [ AlertsPanelComponent, diff --git a/src/app/modules/buttons/copy-button/copy-button.component.ts b/src/app/modules/buttons/copy-button/copy-button.component.ts index 7f38f6b5bc3..00ef8799941 100644 --- a/src/app/modules/buttons/copy-button/copy-button.component.ts +++ b/src/app/modules/buttons/copy-button/copy-button.component.ts @@ -7,7 +7,7 @@ import { MatTooltip } from '@angular/material/tooltip'; import { TranslateModule, TranslateService } from '@ngx-translate/core'; import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; import { SnackbarService } from 'app/modules/snackbar/services/snackbar.service'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestDirective } from 'app/modules/test-id/test.directive'; @Component({ selector: 'ix-copy-button', @@ -18,12 +18,12 @@ import { TestIdModule } from 'app/modules/test-id/test-id.module'; imports: [ MatIconButton, MatTooltip, - TestIdModule, TranslateModule, IxIconComponent, MatMenuTrigger, MatMenu, MatMenuItem, + TestDirective, ], }) export class CopyButtonComponent { diff --git a/src/app/modules/buttons/export-button/export-button.component.ts b/src/app/modules/buttons/export-button/export-button.component.ts index ebc90180b3f..e36efa94501 100644 --- a/src/app/modules/buttons/export-button/export-button.component.ts +++ b/src/app/modules/buttons/export-button/export-button.component.ts @@ -16,7 +16,7 @@ import { DialogService } from 'app/modules/dialog/dialog.service'; import { AdvancedSearchQuery, SearchQuery } from 'app/modules/forms/search-input/types/search-query.interface'; import { SortDirection } from 'app/modules/ix-table/enums/sort-direction.enum'; import { TableSort } from 'app/modules/ix-table/interfaces/table-sort.interface'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestDirective } from 'app/modules/test-id/test.directive'; import { DownloadService } from 'app/services/download.service'; import { ErrorHandlerService } from 'app/services/error-handler.service'; import { WebSocketService } from 'app/services/ws.service'; @@ -29,10 +29,10 @@ import { WebSocketService } from 'app/services/ws.service'; standalone: true, changeDetection: ChangeDetectionStrategy.OnPush, imports: [ - TestIdModule, MatProgressBar, MatButton, TranslateModule, + TestDirective, ], }) export class ExportButtonComponent { diff --git a/src/app/modules/buttons/oauth-button/oauth-button.module.ts b/src/app/modules/buttons/oauth-button/oauth-button.module.ts index 356ed9190f7..af54dc0e9f2 100644 --- a/src/app/modules/buttons/oauth-button/oauth-button.module.ts +++ b/src/app/modules/buttons/oauth-button/oauth-button.module.ts @@ -2,7 +2,7 @@ import { NgModule } from '@angular/core'; import { MatButtonModule } from '@angular/material/button'; import { TranslateModule } from '@ngx-translate/core'; import { OauthButtonComponent } from 'app/modules/buttons/oauth-button/components/oauth-button/oauth-button.component'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestDirective } from 'app/modules/test-id/test.directive'; @NgModule({ declarations: [ @@ -11,7 +11,7 @@ import { TestIdModule } from 'app/modules/test-id/test-id.module'; imports: [ TranslateModule, MatButtonModule, - TestIdModule, + TestDirective, ], exports: [ OauthButtonComponent, diff --git a/src/app/modules/dialog/components/confirm-dialog/confirm-dialog.component.ts b/src/app/modules/dialog/components/confirm-dialog/confirm-dialog.component.ts index 29cc3993677..c6929c76da2 100644 --- a/src/app/modules/dialog/components/confirm-dialog/confirm-dialog.component.ts +++ b/src/app/modules/dialog/components/confirm-dialog/confirm-dialog.component.ts @@ -12,7 +12,7 @@ import { import { TranslateService, TranslateModule } from '@ngx-translate/core'; import { ConfirmOptions, ConfirmOptionsWithSecondaryCheckbox, DialogWithSecondaryCheckboxResult } from 'app/interfaces/dialog.interface'; import { FormActionsComponent } from 'app/modules/forms/ix-forms/components/form-actions/form-actions.component'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestDirective } from 'app/modules/test-id/test.directive'; @Component({ selector: 'ix-confirm-dialog', @@ -25,13 +25,13 @@ import { TestIdModule } from 'app/modules/test-id/test-id.module'; CdkScrollable, MatDialogContent, MatCheckbox, - TestIdModule, ReactiveFormsModule, FormsModule, FormActionsComponent, MatDialogActions, MatButton, TranslateModule, + TestDirective, ], }) export class ConfirmDialogComponent { diff --git a/src/app/modules/dialog/components/error-dialog/error-dialog.component.ts b/src/app/modules/dialog/components/error-dialog/error-dialog.component.ts index 4c84ffd904e..a370304d266 100644 --- a/src/app/modules/dialog/components/error-dialog/error-dialog.component.ts +++ b/src/app/modules/dialog/components/error-dialog/error-dialog.component.ts @@ -13,7 +13,7 @@ import { Job } from 'app/interfaces/job.interface'; import { CopyButtonComponent } from 'app/modules/buttons/copy-button/copy-button.component'; import { DialogService } from 'app/modules/dialog/dialog.service'; import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestDirective } from 'app/modules/test-id/test.directive'; import { DownloadService } from 'app/services/download.service'; import { ErrorHandlerService } from 'app/services/error-handler.service'; import { WebSocketService } from 'app/services/ws.service'; @@ -33,8 +33,8 @@ import { WebSocketService } from 'app/services/ws.service'; CopyButtonComponent, MatDialogActions, MatButton, - TestIdModule, TranslateModule, + TestDirective, ], }) export class ErrorDialogComponent { diff --git a/src/app/modules/dialog/components/full-screen-dialog/full-screen-dialog.component.ts b/src/app/modules/dialog/components/full-screen-dialog/full-screen-dialog.component.ts index b2c9a50c0e3..cdb6ae9b23a 100644 --- a/src/app/modules/dialog/components/full-screen-dialog/full-screen-dialog.component.ts +++ b/src/app/modules/dialog/components/full-screen-dialog/full-screen-dialog.component.ts @@ -2,7 +2,7 @@ import { ChangeDetectionStrategy, Component, Inject } from '@angular/core'; import { MatButton } from '@angular/material/button'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { TranslateModule } from '@ngx-translate/core'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestDirective } from 'app/modules/test-id/test.directive'; @Component({ selector: 'ix-full-screen-dialog', @@ -12,8 +12,8 @@ import { TestIdModule } from 'app/modules/test-id/test-id.module'; standalone: true, imports: [ MatButton, - TestIdModule, TranslateModule, + TestDirective, ], }) export class FullScreenDialogComponent { diff --git a/src/app/modules/dialog/components/general-dialog/general-dialog.component.ts b/src/app/modules/dialog/components/general-dialog/general-dialog.component.ts index 5caaa0e5a89..ff42dd1b874 100644 --- a/src/app/modules/dialog/components/general-dialog/general-dialog.component.ts +++ b/src/app/modules/dialog/components/general-dialog/general-dialog.component.ts @@ -6,7 +6,7 @@ import { } from '@angular/material/dialog'; import { TranslateModule } from '@ngx-translate/core'; import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestDirective } from 'app/modules/test-id/test.directive'; export interface GeneralDialogConfig { title?: string; @@ -38,8 +38,8 @@ export interface GeneralDialogConfig { MatDialogContent, MatDialogActions, MatButton, - TestIdModule, TranslateModule, + TestDirective, ], }) export class GeneralDialogComponent { diff --git a/src/app/modules/dialog/components/info-dialog/info-dialog.component.ts b/src/app/modules/dialog/components/info-dialog/info-dialog.component.ts index 6c23b30bf60..e7627815a2b 100644 --- a/src/app/modules/dialog/components/info-dialog/info-dialog.component.ts +++ b/src/app/modules/dialog/components/info-dialog/info-dialog.component.ts @@ -6,7 +6,7 @@ import { } from '@angular/material/dialog'; import { TranslateModule } from '@ngx-translate/core'; import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestDirective } from 'app/modules/test-id/test.directive'; @Component({ selector: 'ix-info-dialog', @@ -21,8 +21,8 @@ import { TestIdModule } from 'app/modules/test-id/test-id.module'; MatDialogContent, MatDialogActions, MatButton, - TestIdModule, TranslateModule, + TestDirective, ], }) export class InfoDialogComponent { diff --git a/src/app/modules/dialog/components/job-progress/job-progress-dialog.component.ts b/src/app/modules/dialog/components/job-progress/job-progress-dialog.component.ts index 407f15a3bf0..797546ea146 100644 --- a/src/app/modules/dialog/components/job-progress/job-progress-dialog.component.ts +++ b/src/app/modules/dialog/components/job-progress/job-progress-dialog.component.ts @@ -14,7 +14,7 @@ import { Observable, Subscription, map } from 'rxjs'; import { JobState } from 'app/enums/job-state.enum'; import { Job, JobProgress } from 'app/interfaces/job.interface'; import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestDirective } from 'app/modules/test-id/test.directive'; import { ErrorHandlerService } from 'app/services/error-handler.service'; import { WebSocketService } from 'app/services/ws.service'; @@ -58,12 +58,13 @@ export interface JobProgressDialogConfig { MatProgressBar, MatDialogActions, MatButton, - TestIdModule, MatIconButton, MatDialogClose, IxIconComponent, TranslateModule, DecimalPipe, + TestDirective, + TestDirective, ], }) export class JobProgressDialogComponent implements OnInit, AfterViewChecked { diff --git a/src/app/modules/dialog/components/multi-error-dialog/error-template/error-template.component.ts b/src/app/modules/dialog/components/multi-error-dialog/error-template/error-template.component.ts index c4e9d008f2b..22d71db2f17 100644 --- a/src/app/modules/dialog/components/multi-error-dialog/error-template/error-template.component.ts +++ b/src/app/modules/dialog/components/multi-error-dialog/error-template/error-template.component.ts @@ -9,7 +9,7 @@ import { TranslateModule } from '@ngx-translate/core'; import { Job } from 'app/interfaces/job.interface'; import { DialogService } from 'app/modules/dialog/dialog.service'; import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestDirective } from 'app/modules/test-id/test.directive'; import { DownloadService } from 'app/services/download.service'; import { ErrorHandlerService } from 'app/services/error-handler.service'; import { WebSocketService } from 'app/services/ws.service'; @@ -25,8 +25,8 @@ import { WebSocketService } from 'app/services/ws.service'; MatDialogTitle, IxIconComponent, MatButton, - TestIdModule, TranslateModule, + TestDirective, ], }) export class ErrorTemplateComponent { diff --git a/src/app/modules/dialog/components/multi-error-dialog/multi-error-dialog.component.ts b/src/app/modules/dialog/components/multi-error-dialog/multi-error-dialog.component.ts index 91241db6a8e..e4e21733030 100644 --- a/src/app/modules/dialog/components/multi-error-dialog/multi-error-dialog.component.ts +++ b/src/app/modules/dialog/components/multi-error-dialog/multi-error-dialog.component.ts @@ -8,7 +8,7 @@ import { MatDivider } from '@angular/material/divider'; import { TranslateModule } from '@ngx-translate/core'; import { ErrorReport } from 'app/interfaces/error-report.interface'; import { ErrorTemplateComponent } from 'app/modules/dialog/components/multi-error-dialog/error-template/error-template.component'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestDirective } from 'app/modules/test-id/test.directive'; @Component({ selector: 'ix-multi-error-dialog', @@ -24,8 +24,8 @@ import { TestIdModule } from 'app/modules/test-id/test-id.module'; MatDivider, MatDialogActions, MatButton, - TestIdModule, TranslateModule, + TestDirective, ], }) export class MultiErrorDialogComponent { diff --git a/src/app/modules/dialog/components/redirect-dialog/redirect-dialog.component.ts b/src/app/modules/dialog/components/redirect-dialog/redirect-dialog.component.ts index 1c66fa77f74..285073c6467 100644 --- a/src/app/modules/dialog/components/redirect-dialog/redirect-dialog.component.ts +++ b/src/app/modules/dialog/components/redirect-dialog/redirect-dialog.component.ts @@ -7,7 +7,7 @@ import { MatDialogRef, MAT_DIALOG_DATA, MatDialogTitle, MatDialogContent, MatDialogActions, } from '@angular/material/dialog'; import { TranslateModule } from '@ngx-translate/core'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestDirective } from 'app/modules/test-id/test.directive'; import { RedirectDialogData, } from './redirect-dialog-data.interface'; @@ -22,10 +22,10 @@ import { MatDialogTitle, CdkScrollable, MatDialogContent, - TestIdModule, MatDialogActions, MatButton, TranslateModule, + TestDirective, ], }) export class RedirectDialogComponent { diff --git a/src/app/modules/dialog/components/session-expiring-dialog/session-expiring-dialog.component.ts b/src/app/modules/dialog/components/session-expiring-dialog/session-expiring-dialog.component.ts index e8f97052a68..208316d7f62 100644 --- a/src/app/modules/dialog/components/session-expiring-dialog/session-expiring-dialog.component.ts +++ b/src/app/modules/dialog/components/session-expiring-dialog/session-expiring-dialog.component.ts @@ -10,7 +10,7 @@ import { import { TranslateModule } from '@ngx-translate/core'; import { NavigateAndInteractDirective } from 'app/directives/navigate-and-interact/navigate-and-interact.directive'; import { ConfirmOptionsWithSecondaryCheckbox } from 'app/interfaces/dialog.interface'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestDirective } from 'app/modules/test-id/test.directive'; @Component({ selector: 'ix-session-expiring-dialog', @@ -24,9 +24,9 @@ import { TestIdModule } from 'app/modules/test-id/test-id.module'; MatDialogContent, MatDialogActions, MatButton, - TestIdModule, TranslateModule, NavigateAndInteractDirective, + TestDirective, ], }) export class SessionExpiringDialogComponent { diff --git a/src/app/modules/dialog/components/show-logs-dialog/show-logs-dialog.component.ts b/src/app/modules/dialog/components/show-logs-dialog/show-logs-dialog.component.ts index 46d0e2cb4db..13056954c19 100644 --- a/src/app/modules/dialog/components/show-logs-dialog/show-logs-dialog.component.ts +++ b/src/app/modules/dialog/components/show-logs-dialog/show-logs-dialog.component.ts @@ -10,7 +10,7 @@ import { catchError, EMPTY, switchMap } from 'rxjs'; import { Job } from 'app/interfaces/job.interface'; import { CopyButtonComponent } from 'app/modules/buttons/copy-button/copy-button.component'; import { DialogService } from 'app/modules/dialog/dialog.service'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestDirective } from 'app/modules/test-id/test.directive'; import { DownloadService } from 'app/services/download.service'; import { ErrorHandlerService } from 'app/services/error-handler.service'; import { WebSocketService } from 'app/services/ws.service'; @@ -28,8 +28,8 @@ import { WebSocketService } from 'app/services/ws.service'; MatDialogActions, MatButton, MatDialogClose, - TestIdModule, TranslateModule, + TestDirective, ], }) export class ShowLogsDialogComponent { diff --git a/src/app/modules/dialog/components/start-service-dialog/start-service-dialog.component.ts b/src/app/modules/dialog/components/start-service-dialog/start-service-dialog.component.ts index d941588d1d6..f1ebd0c28d0 100644 --- a/src/app/modules/dialog/components/start-service-dialog/start-service-dialog.component.ts +++ b/src/app/modules/dialog/components/start-service-dialog/start-service-dialog.component.ts @@ -16,9 +16,9 @@ import { Service } from 'app/interfaces/service.interface'; import { DialogService } from 'app/modules/dialog/dialog.service'; import { FormActionsComponent } from 'app/modules/forms/ix-forms/components/form-actions/form-actions.component'; import { IxSlideToggleComponent } from 'app/modules/forms/ix-forms/components/ix-slide-toggle/ix-slide-toggle.component'; -import { AppLoaderModule } from 'app/modules/loader/app-loader.module'; +import { FakeProgressBarComponent } from 'app/modules/loader/components/fake-progress-bar/fake-progress-bar.component'; import { SnackbarService } from 'app/modules/snackbar/services/snackbar.service'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestDirective } from 'app/modules/test-id/test.directive'; import { ErrorHandlerService } from 'app/services/error-handler.service'; import { WebSocketService } from 'app/services/ws.service'; import { ServicesState } from 'app/store/services/services.reducer'; @@ -36,7 +36,6 @@ export interface StartServiceDialogResult { changeDetection: ChangeDetectionStrategy.OnPush, standalone: true, imports: [ - AppLoaderModule, MatDialogTitle, CdkScrollable, MatDialogContent, @@ -45,8 +44,9 @@ export interface StartServiceDialogResult { FormActionsComponent, MatDialogActions, MatButton, - TestIdModule, TranslateModule, + FakeProgressBarComponent, + TestDirective, ], }) export class StartServiceDialogComponent implements OnInit { diff --git a/src/app/modules/dialog/components/update-dialog/update-dialog.component.ts b/src/app/modules/dialog/components/update-dialog/update-dialog.component.ts index eaab0378396..431765ad522 100644 --- a/src/app/modules/dialog/components/update-dialog/update-dialog.component.ts +++ b/src/app/modules/dialog/components/update-dialog/update-dialog.component.ts @@ -6,7 +6,7 @@ import { UntilDestroy } from '@ngneat/until-destroy'; import { Store } from '@ngrx/store'; import { TranslateModule } from '@ngx-translate/core'; import { LetDirective } from 'app/directives/app-let.directive'; -import { JobsModule } from 'app/modules/jobs/jobs.module'; +import { JobItemComponent } from 'app/modules/jobs/components/job-item/job-item.component'; import { JobsState } from 'app/modules/jobs/store/job.reducer'; import { selectUpdateJob } from 'app/modules/jobs/store/job.selectors'; @@ -21,10 +21,10 @@ import { selectUpdateJob } from 'app/modules/jobs/store/job.selectors'; CdkScrollable, MatDialogContent, MatDialogTitle, - JobsModule, TranslateModule, AsyncPipe, LetDirective, + JobItemComponent, ], }) export class UpdateDialogComponent { diff --git a/src/app/modules/empty/empty.component.ts b/src/app/modules/empty/empty.component.ts index b3eb1d7b767..480279a9fe7 100644 --- a/src/app/modules/empty/empty.component.ts +++ b/src/app/modules/empty/empty.component.ts @@ -7,7 +7,7 @@ import { EmptyType } from 'app/enums/empty-type.enum'; import { Role } from 'app/enums/role.enum'; import { EmptyConfig } from 'app/interfaces/empty-config.interface'; import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestDirective } from 'app/modules/test-id/test.directive'; @Component({ selector: 'ix-empty', @@ -20,8 +20,8 @@ import { TestIdModule } from 'app/modules/test-id/test-id.module'; TranslateModule, MatProgressSpinnerModule, IxIconComponent, - TestIdModule, RequiresRolesDirective, + TestDirective, ], }) export class EmptyComponent { diff --git a/src/app/modules/entity/entity.module.ts b/src/app/modules/entity/entity.module.ts index 56799345c0e..4a334e0076b 100644 --- a/src/app/modules/entity/entity.module.ts +++ b/src/app/modules/entity/entity.module.ts @@ -7,18 +7,18 @@ import { MatSliderModule } from '@angular/material/slider'; import { TranslateModule } from '@ngx-translate/core'; import { EntityJobComponent } from 'app/modules/entity/entity-job/entity-job.component'; import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestDirective } from 'app/modules/test-id/test.directive'; @NgModule({ imports: [ MatDialogModule, MatProgressBarModule, MatButtonModule, - TestIdModule, IxIconComponent, TranslateModule, MatSliderModule, DecimalPipe, + TestDirective, ], declarations: [ EntityJobComponent, diff --git a/src/app/modules/feedback/feedback.module.ts b/src/app/modules/feedback/feedback.module.ts index b154b1bc5c1..ebe361c2ef8 100644 --- a/src/app/modules/feedback/feedback.module.ts +++ b/src/app/modules/feedback/feedback.module.ts @@ -26,20 +26,18 @@ import { IxSelectComponent } from 'app/modules/forms/ix-forms/components/ix-sele import { IxStarRatingComponent } from 'app/modules/forms/ix-forms/components/ix-star-rating/ix-star-rating.component'; import { IxTextareaComponent } from 'app/modules/forms/ix-forms/components/ix-textarea/ix-textarea.component'; import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; -import { AppLoaderModule } from 'app/modules/loader/app-loader.module'; +import { FakeProgressBarComponent } from 'app/modules/loader/components/fake-progress-bar/fake-progress-bar.component'; import { CastPipe } from 'app/modules/pipes/cast/cast.pipe'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestDirective } from 'app/modules/test-id/test.directive'; @NgModule({ imports: [ - AppLoaderModule, IxIconComponent, RouterModule, MatButtonModule, MatDialogModule, MatTooltipModule, ReactiveFormsModule, - TestIdModule, TranslateModule, OauthButtonModule, NgxSkeletonLoaderModule, @@ -54,6 +52,8 @@ import { TestIdModule } from 'app/modules/test-id/test-id.module'; IxChipsComponent, IxSelectComponent, AsyncPipe, + FakeProgressBarComponent, + TestDirective, ], declarations: [ FeedbackDialogComponent, diff --git a/src/app/modules/forms/ix-forms/components/ix-button-group/ix-button-group.component.ts b/src/app/modules/forms/ix-forms/components/ix-button-group/ix-button-group.component.ts index 535d1224675..3e77c76ea07 100644 --- a/src/app/modules/forms/ix-forms/components/ix-button-group/ix-button-group.component.ts +++ b/src/app/modules/forms/ix-forms/components/ix-button-group/ix-button-group.component.ts @@ -10,7 +10,8 @@ import { Observable } from 'rxjs'; import { Option } from 'app/interfaces/option.interface'; import { IxErrorsComponent } from 'app/modules/forms/ix-forms/components/ix-errors/ix-errors.component'; import { IxLabelComponent } from 'app/modules/forms/ix-forms/components/ix-label/ix-label.component'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestOverrideDirective } from 'app/modules/test-id/test-override/test-override.directive'; +import { TestDirective } from 'app/modules/test-id/test.directive'; @Component({ selector: 'ix-button-group', @@ -20,13 +21,14 @@ import { TestIdModule } from 'app/modules/test-id/test-id.module'; standalone: true, imports: [ IxLabelComponent, - TestIdModule, MatButtonToggleGroup, MatButtonToggle, IxErrorsComponent, MatHint, AsyncPipe, TranslateModule, + TestOverrideDirective, + TestDirective, ], }) export class IxButtonGroupComponent implements ControlValueAccessor { diff --git a/src/app/modules/forms/ix-forms/components/ix-checkbox-list/ix-checkbox-list.component.ts b/src/app/modules/forms/ix-forms/components/ix-checkbox-list/ix-checkbox-list.component.ts index ad3880d774b..d458e0c3244 100644 --- a/src/app/modules/forms/ix-forms/components/ix-checkbox-list/ix-checkbox-list.component.ts +++ b/src/app/modules/forms/ix-forms/components/ix-checkbox-list/ix-checkbox-list.component.ts @@ -10,7 +10,7 @@ import { Observable } from 'rxjs'; import { Option } from 'app/interfaces/option.interface'; import { IxErrorsComponent } from 'app/modules/forms/ix-forms/components/ix-errors/ix-errors.component'; import { IxLabelComponent } from 'app/modules/forms/ix-forms/components/ix-label/ix-label.component'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestDirective } from 'app/modules/test-id/test.directive'; @UntilDestroy() @Component({ @@ -22,10 +22,10 @@ import { TestIdModule } from 'app/modules/test-id/test-id.module'; imports: [ IxLabelComponent, MatCheckbox, - TestIdModule, IxErrorsComponent, AsyncPipe, TranslateModule, + TestDirective, ], }) export class IxCheckboxListComponent implements ControlValueAccessor { diff --git a/src/app/modules/forms/ix-forms/components/ix-checkbox/ix-checkbox.component.ts b/src/app/modules/forms/ix-forms/components/ix-checkbox/ix-checkbox.component.ts index 540f4ed363b..b8c11d6c76e 100644 --- a/src/app/modules/forms/ix-forms/components/ix-checkbox/ix-checkbox.component.ts +++ b/src/app/modules/forms/ix-forms/components/ix-checkbox/ix-checkbox.component.ts @@ -11,7 +11,7 @@ import { UntilDestroy } from '@ngneat/until-destroy'; import { IxErrorsComponent } from 'app/modules/forms/ix-forms/components/ix-errors/ix-errors.component'; import { IxWarningComponent } from 'app/modules/forms/ix-forms/components/ix-warning/ix-warning.component'; import { IxFormService } from 'app/modules/forms/ix-forms/services/ix-form.service'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestDirective } from 'app/modules/test-id/test.directive'; import { TooltipComponent } from 'app/modules/tooltip/tooltip.component'; @UntilDestroy() @@ -23,11 +23,11 @@ import { TooltipComponent } from 'app/modules/tooltip/tooltip.component'; standalone: true, imports: [ MatCheckbox, - TestIdModule, TooltipComponent, IxWarningComponent, IxErrorsComponent, MatHint, + TestDirective, ], }) export class IxCheckboxComponent implements ControlValueAccessor, AfterViewInit, OnDestroy { diff --git a/src/app/modules/forms/ix-forms/components/ix-chips/ix-chips.component.ts b/src/app/modules/forms/ix-forms/components/ix-chips/ix-chips.component.ts index 9e7ba77571a..1d561f37c83 100644 --- a/src/app/modules/forms/ix-forms/components/ix-chips/ix-chips.component.ts +++ b/src/app/modules/forms/ix-forms/components/ix-chips/ix-chips.component.ts @@ -28,7 +28,8 @@ import { ChipsProvider } from 'app/modules/forms/ix-forms/components/ix-chips/ch import { IxErrorsComponent } from 'app/modules/forms/ix-forms/components/ix-errors/ix-errors.component'; import { IxLabelComponent } from 'app/modules/forms/ix-forms/components/ix-label/ix-label.component'; import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestOverrideDirective } from 'app/modules/test-id/test-override/test-override.directive'; +import { TestDirective } from 'app/modules/test-id/test.directive'; @UntilDestroy() @Component({ @@ -39,7 +40,6 @@ import { TestIdModule } from 'app/modules/test-id/test-id.module'; standalone: true, imports: [ IxLabelComponent, - TestIdModule, MatChipGrid, MatChipRow, IxIconComponent, @@ -51,6 +51,8 @@ import { TestIdModule } from 'app/modules/test-id/test-id.module'; IxErrorsComponent, MatHint, AsyncPipe, + TestDirective, + TestOverrideDirective, ], }) export class IxChipsComponent implements OnChanges, ControlValueAccessor { diff --git a/src/app/modules/forms/ix-forms/components/ix-code-editor/ix-code-editor.component.ts b/src/app/modules/forms/ix-forms/components/ix-code-editor/ix-code-editor.component.ts index ee1e17a26a6..f23d532fe8d 100644 --- a/src/app/modules/forms/ix-forms/components/ix-code-editor/ix-code-editor.component.ts +++ b/src/app/modules/forms/ix-forms/components/ix-code-editor/ix-code-editor.component.ts @@ -18,7 +18,7 @@ import { IxSimpleChanges } from 'app/interfaces/simple-changes.interface'; import { IxErrorsComponent } from 'app/modules/forms/ix-forms/components/ix-errors/ix-errors.component'; import { IxLabelComponent } from 'app/modules/forms/ix-forms/components/ix-label/ix-label.component'; import { IxSelectValue } from 'app/modules/forms/ix-forms/components/ix-select/ix-select.component'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestOverrideDirective } from 'app/modules/test-id/test-override/test-override.directive'; @UntilDestroy() @Component({ @@ -29,10 +29,10 @@ import { TestIdModule } from 'app/modules/test-id/test-id.module'; standalone: true, imports: [ IxLabelComponent, - TestIdModule, IxErrorsComponent, MatHint, AsyncPipe, + TestOverrideDirective, ], }) export class IxCodeEditorComponent implements OnChanges, OnInit, AfterViewInit, ControlValueAccessor { diff --git a/src/app/modules/forms/ix-forms/components/ix-combobox/ix-combobox.component.ts b/src/app/modules/forms/ix-forms/components/ix-combobox/ix-combobox.component.ts index c645e4212da..c23e0e9dd04 100644 --- a/src/app/modules/forms/ix-forms/components/ix-combobox/ix-combobox.component.ts +++ b/src/app/modules/forms/ix-forms/components/ix-combobox/ix-combobox.component.ts @@ -30,7 +30,8 @@ import { IxComboboxProvider, IxComboboxProviderManager } from 'app/modules/forms import { IxErrorsComponent } from 'app/modules/forms/ix-forms/components/ix-errors/ix-errors.component'; import { IxLabelComponent } from 'app/modules/forms/ix-forms/components/ix-label/ix-label.component'; import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestOverrideDirective } from 'app/modules/test-id/test-override/test-override.directive'; +import { TestDirective } from 'app/modules/test-id/test.directive'; @UntilDestroy() @Component({ @@ -41,7 +42,6 @@ import { TestIdModule } from 'app/modules/test-id/test-id.module'; standalone: true, imports: [ IxLabelComponent, - TestIdModule, MatInput, MatAutocompleteTrigger, MatProgressSpinner, @@ -51,6 +51,8 @@ import { TestIdModule } from 'app/modules/test-id/test-id.module'; IxErrorsComponent, MatHint, TranslateModule, + TestOverrideDirective, + TestDirective, ], }) export class IxComboboxComponent implements ControlValueAccessor, OnInit { diff --git a/src/app/modules/forms/ix-forms/components/ix-explorer/create-dataset-dialog/create-dataset-dialog.component.ts b/src/app/modules/forms/ix-forms/components/ix-explorer/create-dataset-dialog/create-dataset-dialog.component.ts index 9190394fba9..72ec71f33f3 100644 --- a/src/app/modules/forms/ix-forms/components/ix-explorer/create-dataset-dialog/create-dataset-dialog.component.ts +++ b/src/app/modules/forms/ix-forms/components/ix-explorer/create-dataset-dialog/create-dataset-dialog.component.ts @@ -22,7 +22,7 @@ import { DialogService } from 'app/modules/dialog/dialog.service'; import { FormActionsComponent } from 'app/modules/forms/ix-forms/components/form-actions/form-actions.component'; import { IxInputComponent } from 'app/modules/forms/ix-forms/components/ix-input/ix-input.component'; import { forbiddenValues } from 'app/modules/forms/ix-forms/validators/forbidden-values-validation/forbidden-values-validation'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestDirective } from 'app/modules/test-id/test.directive'; import { datasetNameTooLong } from 'app/pages/datasets/components/dataset-form/utils/name-length-validation'; import { ErrorHandlerService } from 'app/services/error-handler.service'; import { WebSocketService } from 'app/services/ws.service'; @@ -46,10 +46,10 @@ import { WebSocketService } from 'app/services/ws.service'; MatDialogActions, MatButton, MatDialogClose, - TestIdModule, AsyncPipe, TranslateModule, RequiresRolesDirective, + TestDirective, ], }) export class CreateDatasetDialogComponent implements OnInit { diff --git a/src/app/modules/forms/ix-forms/components/ix-explorer/ix-explorer.component.ts b/src/app/modules/forms/ix-forms/components/ix-explorer/ix-explorer.component.ts index a4920b29962..0c11397fea1 100644 --- a/src/app/modules/forms/ix-forms/components/ix-explorer/ix-explorer.component.ts +++ b/src/app/modules/forms/ix-forms/components/ix-explorer/ix-explorer.component.ts @@ -32,7 +32,8 @@ import { CreateDatasetDialogComponent } from 'app/modules/forms/ix-forms/compone import { TreeNodeProvider } from 'app/modules/forms/ix-forms/components/ix-explorer/tree-node-provider.interface'; import { IxLabelComponent } from 'app/modules/forms/ix-forms/components/ix-label/ix-label.component'; import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestOverrideDirective } from 'app/modules/test-id/test-override/test-override.directive'; +import { TestDirective } from 'app/modules/test-id/test.directive'; @UntilDestroy() @Component({ @@ -43,7 +44,6 @@ import { TestIdModule } from 'app/modules/test-id/test-id.module'; standalone: true, imports: [ IxLabelComponent, - TestIdModule, MatInput, MatButton, IxIconComponent, @@ -53,6 +53,8 @@ import { TestIdModule } from 'app/modules/test-id/test-id.module'; MatHint, TranslateModule, RequiresRolesDirective, + TestDirective, + TestOverrideDirective, ], }) export class IxExplorerComponent implements OnInit, OnChanges, ControlValueAccessor { diff --git a/src/app/modules/forms/ix-forms/components/ix-file-input/ix-file-input.component.ts b/src/app/modules/forms/ix-forms/components/ix-file-input/ix-file-input.component.ts index 2c1c679787f..7d23172d225 100644 --- a/src/app/modules/forms/ix-forms/components/ix-file-input/ix-file-input.component.ts +++ b/src/app/modules/forms/ix-forms/components/ix-file-input/ix-file-input.component.ts @@ -11,7 +11,8 @@ import { IxErrorsComponent } from 'app/modules/forms/ix-forms/components/ix-erro import { IxLabelComponent } from 'app/modules/forms/ix-forms/components/ix-label/ix-label.component'; import { IxFormatterService } from 'app/modules/forms/ix-forms/services/ix-formatter.service'; import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestOverrideDirective } from 'app/modules/test-id/test-override/test-override.directive'; +import { TestDirective } from 'app/modules/test-id/test.directive'; @UntilDestroy() @Component({ @@ -22,11 +23,12 @@ import { TestIdModule } from 'app/modules/test-id/test-id.module'; standalone: true, imports: [ IxLabelComponent, - TestIdModule, MatTooltip, IxIconComponent, IxErrorsComponent, TranslateModule, + TestDirective, + TestOverrideDirective, ], }) export class IxFileInputComponent implements ControlValueAccessor { diff --git a/src/app/modules/forms/ix-forms/components/ix-icon-group/ix-icon-group.component.ts b/src/app/modules/forms/ix-forms/components/ix-icon-group/ix-icon-group.component.ts index 295aaa590b8..608a0fe83ba 100644 --- a/src/app/modules/forms/ix-forms/components/ix-icon-group/ix-icon-group.component.ts +++ b/src/app/modules/forms/ix-forms/components/ix-icon-group/ix-icon-group.component.ts @@ -9,7 +9,7 @@ import { IxErrorsComponent } from 'app/modules/forms/ix-forms/components/ix-erro import { IconGroupOption } from 'app/modules/forms/ix-forms/components/ix-icon-group/icon-group-option.interface'; import { IxLabelComponent } from 'app/modules/forms/ix-forms/components/ix-label/ix-label.component'; import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestDirective } from 'app/modules/test-id/test.directive'; @UntilDestroy() @Component({ @@ -21,10 +21,10 @@ import { TestIdModule } from 'app/modules/test-id/test-id.module'; imports: [ IxLabelComponent, MatIconButton, - TestIdModule, IxIconComponent, IxErrorsComponent, TranslateModule, + TestDirective, ], }) export class IxIconGroupComponent implements ControlValueAccessor { diff --git a/src/app/modules/forms/ix-forms/components/ix-input/ix-input.component.ts b/src/app/modules/forms/ix-forms/components/ix-input/ix-input.component.ts index 6d009e39dd9..d2a3f56e26c 100644 --- a/src/app/modules/forms/ix-forms/components/ix-input/ix-input.component.ts +++ b/src/app/modules/forms/ix-forms/components/ix-input/ix-input.component.ts @@ -29,7 +29,8 @@ import { IxErrorsComponent } from 'app/modules/forms/ix-forms/components/ix-erro import { IxLabelComponent } from 'app/modules/forms/ix-forms/components/ix-label/ix-label.component'; import { IxFormService } from 'app/modules/forms/ix-forms/services/ix-form.service'; import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestOverrideDirective } from 'app/modules/test-id/test-override/test-override.directive'; +import { TestDirective } from 'app/modules/test-id/test.directive'; @UntilDestroy() @Component({ @@ -40,7 +41,6 @@ import { TestIdModule } from 'app/modules/test-id/test-id.module'; standalone: true, imports: [ IxLabelComponent, - TestIdModule, IxIconComponent, MatInput, MatAutocompleteTrigger, @@ -52,6 +52,8 @@ import { TestIdModule } from 'app/modules/test-id/test-id.module'; IxErrorsComponent, MatHint, TranslateModule, + TestOverrideDirective, + TestDirective, ], }) export class IxInputComponent implements ControlValueAccessor, OnInit, OnChanges, AfterViewInit, OnDestroy { diff --git a/src/app/modules/forms/ix-forms/components/ix-ip-input-with-netmask/ix-ip-input-with-netmask.component.ts b/src/app/modules/forms/ix-forms/components/ix-ip-input-with-netmask/ix-ip-input-with-netmask.component.ts index d6f16f3e054..620f6c6f5ac 100644 --- a/src/app/modules/forms/ix-forms/components/ix-ip-input-with-netmask/ix-ip-input-with-netmask.component.ts +++ b/src/app/modules/forms/ix-forms/components/ix-ip-input-with-netmask/ix-ip-input-with-netmask.component.ts @@ -8,7 +8,8 @@ import { MatSelectChange, MatSelect } from '@angular/material/select'; import { TranslateModule } from '@ngx-translate/core'; import { IxErrorsComponent } from 'app/modules/forms/ix-forms/components/ix-errors/ix-errors.component'; import { IxLabelComponent } from 'app/modules/forms/ix-forms/components/ix-label/ix-label.component'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestOverrideDirective } from 'app/modules/test-id/test-override/test-override.directive'; +import { TestDirective } from 'app/modules/test-id/test.directive'; import { NetworkService } from 'app/services/network.service'; @Component({ @@ -19,12 +20,13 @@ import { NetworkService } from 'app/services/network.service'; standalone: true, imports: [ IxLabelComponent, - TestIdModule, MatInput, MatSelect, MatOption, IxErrorsComponent, TranslateModule, + TestDirective, + TestOverrideDirective, ], }) export class IxIpInputWithNetmaskComponent implements ControlValueAccessor { diff --git a/src/app/modules/forms/ix-forms/components/ix-list/ix-list-item/ix-list-item.component.ts b/src/app/modules/forms/ix-forms/components/ix-list/ix-list-item/ix-list-item.component.ts index 2d6e599d7a1..573f311d013 100644 --- a/src/app/modules/forms/ix-forms/components/ix-list/ix-list-item/ix-list-item.component.ts +++ b/src/app/modules/forms/ix-forms/components/ix-list/ix-list-item/ix-list-item.component.ts @@ -5,7 +5,7 @@ import { import { MatIconButton } from '@angular/material/button'; import { TranslateModule } from '@ngx-translate/core'; import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestDirective } from 'app/modules/test-id/test.directive'; @Component({ selector: 'ix-list-item', @@ -15,9 +15,9 @@ import { TestIdModule } from 'app/modules/test-id/test-id.module'; standalone: true, imports: [ MatIconButton, - TestIdModule, IxIconComponent, TranslateModule, + TestDirective, ], }) export class IxListItemComponent { diff --git a/src/app/modules/forms/ix-forms/components/ix-list/ix-list.component.ts b/src/app/modules/forms/ix-forms/components/ix-list/ix-list.component.ts index 3e44ec7f9ed..e82e147dbf5 100644 --- a/src/app/modules/forms/ix-forms/components/ix-list/ix-list.component.ts +++ b/src/app/modules/forms/ix-forms/components/ix-list/ix-list.component.ts @@ -11,7 +11,7 @@ import { TranslateModule } from '@ngx-translate/core'; import { ChartSchemaNode } from 'app/interfaces/app.interface'; import { IxErrorsComponent } from 'app/modules/forms/ix-forms/components/ix-errors/ix-errors.component'; import { IxLabelComponent } from 'app/modules/forms/ix-forms/components/ix-label/ix-label.component'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestDirective } from 'app/modules/test-id/test.directive'; @Component({ selector: 'ix-list', @@ -22,9 +22,9 @@ import { TestIdModule } from 'app/modules/test-id/test-id.module'; imports: [ IxLabelComponent, MatButton, - TestIdModule, IxErrorsComponent, TranslateModule, + TestDirective, ], }) export class IxListComponent implements AfterViewInit { diff --git a/src/app/modules/forms/ix-forms/components/ix-permissions/ix-permissions.component.ts b/src/app/modules/forms/ix-forms/components/ix-permissions/ix-permissions.component.ts index ad686b693bb..607d45aa65e 100644 --- a/src/app/modules/forms/ix-forms/components/ix-permissions/ix-permissions.component.ts +++ b/src/app/modules/forms/ix-forms/components/ix-permissions/ix-permissions.component.ts @@ -8,7 +8,8 @@ import { PosixPermission } from 'app/enums/posix-acl.enum'; import { parseMode } from 'app/helpers/mode.helper'; import { IxErrorsComponent } from 'app/modules/forms/ix-forms/components/ix-errors/ix-errors.component'; import { IxLabelComponent } from 'app/modules/forms/ix-forms/components/ix-label/ix-label.component'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestOverrideDirective } from 'app/modules/test-id/test-override/test-override.directive'; +import { TestDirective } from 'app/modules/test-id/test.directive'; @Component({ selector: 'ix-permissions', @@ -18,10 +19,11 @@ import { TestIdModule } from 'app/modules/test-id/test-id.module'; standalone: true, imports: [ IxLabelComponent, - TestIdModule, MatCheckbox, IxErrorsComponent, TranslateModule, + TestOverrideDirective, + TestDirective, ], }) export class IxPermissionsComponent implements ControlValueAccessor { diff --git a/src/app/modules/forms/ix-forms/components/ix-radio-group/ix-radio-group.component.ts b/src/app/modules/forms/ix-forms/components/ix-radio-group/ix-radio-group.component.ts index 75705b98173..e6f1fc84a4e 100644 --- a/src/app/modules/forms/ix-forms/components/ix-radio-group/ix-radio-group.component.ts +++ b/src/app/modules/forms/ix-forms/components/ix-radio-group/ix-radio-group.component.ts @@ -12,7 +12,8 @@ import { Observable } from 'rxjs'; import { RadioOption } from 'app/interfaces/option.interface'; import { IxErrorsComponent } from 'app/modules/forms/ix-forms/components/ix-errors/ix-errors.component'; import { IxLabelComponent } from 'app/modules/forms/ix-forms/components/ix-label/ix-label.component'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestOverrideDirective } from 'app/modules/test-id/test-override/test-override.directive'; +import { TestDirective } from 'app/modules/test-id/test.directive'; import { TooltipComponent } from 'app/modules/tooltip/tooltip.component'; @UntilDestroy() @@ -24,13 +25,14 @@ import { TooltipComponent } from 'app/modules/tooltip/tooltip.component'; standalone: true, imports: [ IxLabelComponent, - TestIdModule, MatRadioGroup, MatRadioButton, TooltipComponent, IxErrorsComponent, AsyncPipe, TranslateModule, + TestOverrideDirective, + TestDirective, ], }) export class IxRadioGroupComponent implements ControlValueAccessor { diff --git a/src/app/modules/forms/ix-forms/components/ix-select/ix-select.component.ts b/src/app/modules/forms/ix-forms/components/ix-select/ix-select.component.ts index 29ae06871f1..36db4682d9a 100644 --- a/src/app/modules/forms/ix-forms/components/ix-select/ix-select.component.ts +++ b/src/app/modules/forms/ix-forms/components/ix-select/ix-select.component.ts @@ -17,7 +17,8 @@ import { SelectOption, SelectOptionValueType } from 'app/interfaces/option.inter import { IxErrorsComponent } from 'app/modules/forms/ix-forms/components/ix-errors/ix-errors.component'; import { IxLabelComponent } from 'app/modules/forms/ix-forms/components/ix-label/ix-label.component'; import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestOverrideDirective } from 'app/modules/test-id/test-override/test-override.directive'; +import { TestDirective } from 'app/modules/test-id/test.directive'; import { TooltipComponent } from 'app/modules/tooltip/tooltip.component'; export type IxSelectValue = SelectOptionValueType; @@ -31,7 +32,6 @@ export type IxSelectValue = SelectOptionValueType; standalone: true, imports: [ IxLabelComponent, - TestIdModule, MatSelect, FormsModule, MatSelectTrigger, @@ -44,6 +44,8 @@ export type IxSelectValue = SelectOptionValueType; MatHint, AsyncPipe, TranslateModule, + TestDirective, + TestOverrideDirective, ], }) export class IxSelectComponent implements ControlValueAccessor, OnInit, OnChanges { diff --git a/src/app/modules/forms/ix-forms/components/ix-slide-in/components/ix-modal-header2/ix-modal-header2.component.ts b/src/app/modules/forms/ix-forms/components/ix-slide-in/components/ix-modal-header2/ix-modal-header2.component.ts index 80478115a13..b7f33d8d9a5 100644 --- a/src/app/modules/forms/ix-forms/components/ix-slide-in/components/ix-modal-header2/ix-modal-header2.component.ts +++ b/src/app/modules/forms/ix-forms/components/ix-slide-in/components/ix-modal-header2/ix-modal-header2.component.ts @@ -13,7 +13,7 @@ import { Role } from 'app/enums/role.enum'; import { ChainedRef } from 'app/modules/forms/ix-forms/components/ix-slide-in/chained-component-ref'; import { ReadOnlyComponent } from 'app/modules/forms/ix-forms/components/readonly-badge/readonly-badge.component'; import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestDirective } from 'app/modules/test-id/test.directive'; import { AuthService } from 'app/services/auth/auth.service'; import { IxChainedSlideInService } from 'app/services/ix-chained-slide-in.service'; @@ -26,13 +26,13 @@ import { IxChainedSlideInService } from 'app/services/ix-chained-slide-in.servic standalone: true, imports: [ MatIconButton, - TestIdModule, MatTooltip, IxIconComponent, ReadOnlyComponent, MatProgressBar, AsyncPipe, TranslateModule, + TestDirective, ], }) export class IxModalHeader2Component implements AfterViewInit { diff --git a/src/app/modules/forms/ix-forms/components/ix-slide-toggle/ix-slide-toggle.component.ts b/src/app/modules/forms/ix-forms/components/ix-slide-toggle/ix-slide-toggle.component.ts index 571ab605b92..09a8fa767d7 100644 --- a/src/app/modules/forms/ix-forms/components/ix-slide-toggle/ix-slide-toggle.component.ts +++ b/src/app/modules/forms/ix-forms/components/ix-slide-toggle/ix-slide-toggle.component.ts @@ -7,7 +7,7 @@ import { import { MatSlideToggleChange, MatSlideToggle } from '@angular/material/slide-toggle'; import { UntilDestroy } from '@ngneat/until-destroy'; import { IxErrorsComponent } from 'app/modules/forms/ix-forms/components/ix-errors/ix-errors.component'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestDirective } from 'app/modules/test-id/test.directive'; import { TooltipComponent } from 'app/modules/tooltip/tooltip.component'; @UntilDestroy() @@ -19,9 +19,9 @@ import { TooltipComponent } from 'app/modules/tooltip/tooltip.component'; standalone: true, imports: [ MatSlideToggle, - TestIdModule, TooltipComponent, IxErrorsComponent, + TestDirective, ], }) export class IxSlideToggleComponent implements ControlValueAccessor { diff --git a/src/app/modules/forms/ix-forms/components/ix-star-rating/ix-star-rating.component.ts b/src/app/modules/forms/ix-forms/components/ix-star-rating/ix-star-rating.component.ts index f31a6236ed3..8b96239f780 100644 --- a/src/app/modules/forms/ix-forms/components/ix-star-rating/ix-star-rating.component.ts +++ b/src/app/modules/forms/ix-forms/components/ix-star-rating/ix-star-rating.component.ts @@ -8,7 +8,7 @@ import { TranslateModule } from '@ngx-translate/core'; import { IxErrorsComponent } from 'app/modules/forms/ix-forms/components/ix-errors/ix-errors.component'; import { IxLabelComponent } from 'app/modules/forms/ix-forms/components/ix-label/ix-label.component'; import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestDirective } from 'app/modules/test-id/test.directive'; @UntilDestroy() @Component({ @@ -20,10 +20,10 @@ import { TestIdModule } from 'app/modules/test-id/test-id.module'; imports: [ IxLabelComponent, MatIconButton, - TestIdModule, IxIconComponent, IxErrorsComponent, TranslateModule, + TestDirective, ], }) export class IxStarRatingComponent implements ControlValueAccessor { diff --git a/src/app/modules/forms/ix-forms/components/ix-textarea/ix-textarea.component.ts b/src/app/modules/forms/ix-forms/components/ix-textarea/ix-textarea.component.ts index 4e860ee9582..bb3ebd75c1c 100644 --- a/src/app/modules/forms/ix-forms/components/ix-textarea/ix-textarea.component.ts +++ b/src/app/modules/forms/ix-forms/components/ix-textarea/ix-textarea.component.ts @@ -7,7 +7,8 @@ import { MatInput } from '@angular/material/input'; import { UntilDestroy } from '@ngneat/until-destroy'; import { IxErrorsComponent } from 'app/modules/forms/ix-forms/components/ix-errors/ix-errors.component'; import { IxLabelComponent } from 'app/modules/forms/ix-forms/components/ix-label/ix-label.component'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestOverrideDirective } from 'app/modules/test-id/test-override/test-override.directive'; +import { TestDirective } from 'app/modules/test-id/test.directive'; @UntilDestroy() @Component({ @@ -18,11 +19,12 @@ import { TestIdModule } from 'app/modules/test-id/test-id.module'; standalone: true, imports: [ IxLabelComponent, - TestIdModule, MatInput, FormsModule, IxErrorsComponent, MatHint, + TestDirective, + TestOverrideDirective, ], }) export class IxTextareaComponent implements ControlValueAccessor { diff --git a/src/app/modules/forms/ix-forms/components/with-manage-certificates-link/with-manage-certificates-link.component.ts b/src/app/modules/forms/ix-forms/components/with-manage-certificates-link/with-manage-certificates-link.component.ts index cce181b2d08..b8957dc302d 100644 --- a/src/app/modules/forms/ix-forms/components/with-manage-certificates-link/with-manage-certificates-link.component.ts +++ b/src/app/modules/forms/ix-forms/components/with-manage-certificates-link/with-manage-certificates-link.component.ts @@ -1,7 +1,7 @@ import { ChangeDetectionStrategy, Component } from '@angular/core'; import { RouterLink } from '@angular/router'; import { TranslateModule } from '@ngx-translate/core'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestDirective } from 'app/modules/test-id/test.directive'; /** * Adds a manage certificates link to the form control. @@ -14,9 +14,9 @@ import { TestIdModule } from 'app/modules/test-id/test-id.module'; changeDetection: ChangeDetectionStrategy.OnPush, standalone: true, imports: [ - TestIdModule, RouterLink, TranslateModule, + TestDirective, ], }) export class WithManageCertificatesLinkComponent { diff --git a/src/app/modules/forms/search-input/search-input.module.ts b/src/app/modules/forms/search-input/search-input.module.ts index 6bf5a055ced..5c3b20e398f 100644 --- a/src/app/modules/forms/search-input/search-input.module.ts +++ b/src/app/modules/forms/search-input/search-input.module.ts @@ -13,14 +13,13 @@ import { AdvancedSearchAutocompleteService } from 'app/modules/forms/search-inpu import { QueryParserService } from 'app/modules/forms/search-input/services/query-parser/query-parser.service'; import { QueryToApiService } from 'app/modules/forms/search-input/services/query-to-api/query-to-api.service'; import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestDirective } from 'app/modules/test-id/test.directive'; import { SearchInputComponent } from './components/search-input/search-input.component'; @NgModule({ imports: [ IxIconComponent, MatInputModule, - TestIdModule, TranslateModule, ReactiveFormsModule, FormsModule, @@ -29,6 +28,7 @@ import { SearchInputComponent } from './components/search-input/search-input.com MatCardModule, MatTooltipModule, AsyncPipe, + TestDirective, ], exports: [ SearchInputComponent, diff --git a/src/app/modules/forms/search-input1/search-input1.component.ts b/src/app/modules/forms/search-input1/search-input1.component.ts index 061bbefaf82..b51f1ea2772 100644 --- a/src/app/modules/forms/search-input1/search-input1.component.ts +++ b/src/app/modules/forms/search-input1/search-input1.component.ts @@ -14,7 +14,7 @@ import { TranslateModule } from '@ngx-translate/core'; import { debounceTime, distinctUntilChanged, Subject } from 'rxjs'; import { IxSimpleChanges } from 'app/interfaces/simple-changes.interface'; import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestDirective } from 'app/modules/test-id/test.directive'; /** * @deprecated Try ix-basic-search instead. @@ -30,7 +30,7 @@ import { TestIdModule } from 'app/modules/test-id/test-id.module'; IxIconComponent, TranslateModule, MatInputModule, - TestIdModule, + TestDirective, ], }) export class SearchInput1Component implements OnInit, OnChanges { diff --git a/src/app/modules/forms/toolbar-slider/toolbar-slider.component.ts b/src/app/modules/forms/toolbar-slider/toolbar-slider.component.ts index 4d638501e77..0583ac708c0 100644 --- a/src/app/modules/forms/toolbar-slider/toolbar-slider.component.ts +++ b/src/app/modules/forms/toolbar-slider/toolbar-slider.component.ts @@ -2,7 +2,7 @@ import { ChangeDetectionStrategy, Component, input, model, } from '@angular/core'; import { MatSlider, MatSliderThumb } from '@angular/material/slider'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestDirective } from 'app/modules/test-id/test.directive'; @Component({ selector: 'ix-toolbar-slider', @@ -13,7 +13,7 @@ import { TestIdModule } from 'app/modules/test-id/test-id.module'; imports: [ MatSlider, MatSliderThumb, - TestIdModule, + TestDirective, ], }) export class ToolbarSliderComponent { diff --git a/src/app/modules/global-search/global-search.module.ts b/src/app/modules/global-search/global-search.module.ts index 127af77ab4e..8c6f9e554f9 100644 --- a/src/app/modules/global-search/global-search.module.ts +++ b/src/app/modules/global-search/global-search.module.ts @@ -13,7 +13,7 @@ import { GlobalSearchResultsComponent } from 'app/modules/global-search/componen import { GlobalSearchTriggerComponent } from 'app/modules/global-search/components/global-search-trigger/global-search-trigger.component'; import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; import { KeyboardShortcutComponent } from 'app/modules/keyboard-shortcut/keyboard-shortcut.component'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestDirective } from 'app/modules/test-id/test.directive'; @NgModule({ declarations: [ @@ -24,7 +24,6 @@ import { TestIdModule } from 'app/modules/test-id/test-id.module'; imports: [ IxIconComponent, MatInputModule, - TestIdModule, TranslateModule, MatDialogModule, ReactiveFormsModule, @@ -34,6 +33,7 @@ import { TestIdModule } from 'app/modules/test-id/test-id.module'; EmptyComponent, MatButtonModule, KeyboardShortcutComponent, + TestDirective, ], exports: [GlobalSearchComponent, GlobalSearchTriggerComponent], }) diff --git a/src/app/modules/ix-table/components/ix-empty-row/ix-empty-row.component.ts b/src/app/modules/ix-table/components/ix-empty-row/ix-empty-row.component.ts index c86c2587766..f0cdf39a1e8 100644 --- a/src/app/modules/ix-table/components/ix-empty-row/ix-empty-row.component.ts +++ b/src/app/modules/ix-table/components/ix-empty-row/ix-empty-row.component.ts @@ -8,7 +8,7 @@ import { TranslateService, TranslateModule } from '@ngx-translate/core'; import { EmptyType } from 'app/enums/empty-type.enum'; import { EmptyConfig } from 'app/interfaces/empty-config.interface'; import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestDirective } from 'app/modules/test-id/test.directive'; @Component({ selector: 'ix-empty-row', @@ -21,8 +21,8 @@ import { TestIdModule } from 'app/modules/test-id/test-id.module'; MatProgressSpinner, IxIconComponent, MatButton, - TestIdModule, TranslateModule, + TestDirective, ], }) export class IxTableEmptyRowComponent implements AfterViewInit { diff --git a/src/app/modules/ix-table/components/ix-table-body/cells/ix-cell-actions/ix-cell-actions.component.ts b/src/app/modules/ix-table/components/ix-table-body/cells/ix-cell-actions/ix-cell-actions.component.ts index 754cf4ecc5c..ceb0f195fd3 100644 --- a/src/app/modules/ix-table/components/ix-table-body/cells/ix-cell-actions/ix-cell-actions.component.ts +++ b/src/app/modules/ix-table/components/ix-table-body/cells/ix-cell-actions/ix-cell-actions.component.ts @@ -7,7 +7,7 @@ import { Role } from 'app/enums/role.enum'; import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; import { IconActionConfig } from 'app/modules/ix-table/components/ix-table-body/cells/ix-cell-actions/icon-action-config.interface'; import { ColumnComponent, Column } from 'app/modules/ix-table/interfaces/column-component.class'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestDirective } from 'app/modules/test-id/test.directive'; @Component({ selector: 'ix-cell-actions', @@ -19,9 +19,9 @@ import { TestIdModule } from 'app/modules/test-id/test-id.module'; MatTooltip, RequiresRolesDirective, MatIconButton, - TestIdModule, IxIconComponent, AsyncPipe, + TestDirective, ], }) export class IxCellActionsComponent extends ColumnComponent { diff --git a/src/app/modules/ix-table/components/ix-table-body/cells/ix-cell-checkbox/ix-cell-checkbox.component.ts b/src/app/modules/ix-table/components/ix-table-body/cells/ix-cell-checkbox/ix-cell-checkbox.component.ts index fde2ad350c1..fa952034988 100644 --- a/src/app/modules/ix-table/components/ix-table-body/cells/ix-cell-checkbox/ix-cell-checkbox.component.ts +++ b/src/app/modules/ix-table/components/ix-table-body/cells/ix-cell-checkbox/ix-cell-checkbox.component.ts @@ -3,7 +3,7 @@ import { MatCheckboxChange, MatCheckbox } from '@angular/material/checkbox'; import { TranslateModule } from '@ngx-translate/core'; import { IxHeaderCellCheckboxComponent } from 'app/modules/ix-table/components/ix-table-head/head-cells/ix-header-cell-checkbox/ix-header-cell-checkbox.component'; import { ColumnComponent, Column } from 'app/modules/ix-table/interfaces/column-component.class'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestDirective } from 'app/modules/test-id/test.directive'; @Component({ selector: 'ix-cell-checkbox', @@ -12,8 +12,8 @@ import { TestIdModule } from 'app/modules/test-id/test-id.module'; standalone: true, imports: [ MatCheckbox, - TestIdModule, TranslateModule, + TestDirective, ], }) export class IxCellCheckboxComponent extends ColumnComponent { diff --git a/src/app/modules/ix-table/components/ix-table-body/cells/ix-cell-date/ix-cell-date.component.ts b/src/app/modules/ix-table/components/ix-table-body/cells/ix-cell-date/ix-cell-date.component.ts index a6ceb0daea6..0140b56321c 100644 --- a/src/app/modules/ix-table/components/ix-table-body/cells/ix-cell-date/ix-cell-date.component.ts +++ b/src/app/modules/ix-table/components/ix-table-body/cells/ix-cell-date/ix-cell-date.component.ts @@ -3,7 +3,7 @@ import { TranslateModule } from '@ngx-translate/core'; import { ApiTimestamp } from 'app/interfaces/api-date.interface'; import { Column, ColumnComponent } from 'app/modules/ix-table/interfaces/column-component.class'; import { IxDateComponent } from 'app/modules/pipes/ix-date/ix-date.component'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestDirective } from 'app/modules/test-id/test.directive'; @Component({ selector: 'ix-cell-date', @@ -12,8 +12,8 @@ import { TestIdModule } from 'app/modules/test-id/test-id.module'; standalone: true, imports: [ IxDateComponent, - TestIdModule, TranslateModule, + TestDirective, ], }) export class IxCellDateComponent extends ColumnComponent { diff --git a/src/app/modules/ix-table/components/ix-table-body/cells/ix-cell-relative-date/ix-cell-relative-date.component.ts b/src/app/modules/ix-table/components/ix-table-body/cells/ix-cell-relative-date/ix-cell-relative-date.component.ts index b467b97bead..562239d70be 100644 --- a/src/app/modules/ix-table/components/ix-table-body/cells/ix-cell-relative-date/ix-cell-relative-date.component.ts +++ b/src/app/modules/ix-table/components/ix-table-body/cells/ix-cell-relative-date/ix-cell-relative-date.component.ts @@ -6,7 +6,7 @@ import { utcToZonedTime, zonedTimeToUtc } from 'date-fns-tz'; import { formatDistanceToNowShortened } from 'app/helpers/format-distance-to-now-shortened'; import { ColumnComponent, Column } from 'app/modules/ix-table/interfaces/column-component.class'; import { FormatDateTimePipe } from 'app/modules/pipes/format-date-time/format-datetime.pipe'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestDirective } from 'app/modules/test-id/test.directive'; import { LocaleService } from 'app/services/locale.service'; @Component({ @@ -14,7 +14,7 @@ import { LocaleService } from 'app/services/locale.service'; templateUrl: './ix-cell-relative-date.component.html', changeDetection: ChangeDetectionStrategy.OnPush, standalone: true, - imports: [MatTooltip, TestIdModule], + imports: [MatTooltip, TestDirective], providers: [FormatDateTimePipe], }) export class IxCellRelativeDateComponent extends ColumnComponent { diff --git a/src/app/modules/ix-table/components/ix-table-body/cells/ix-cell-schedule/ix-cell-schedule.component.ts b/src/app/modules/ix-table/components/ix-table-body/cells/ix-cell-schedule/ix-cell-schedule.component.ts index 2100f80358f..6c449cab743 100644 --- a/src/app/modules/ix-table/components/ix-table-body/cells/ix-cell-schedule/ix-cell-schedule.component.ts +++ b/src/app/modules/ix-table/components/ix-table-body/cells/ix-cell-schedule/ix-cell-schedule.component.ts @@ -1,14 +1,14 @@ import { ChangeDetectionStrategy, Component } from '@angular/core'; import { ColumnComponent, Column } from 'app/modules/ix-table/interfaces/column-component.class'; import { ScheduleToCrontabPipe } from 'app/modules/pipes/schedule-to-crontab/schedule-to-crontab.pipe'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestDirective } from 'app/modules/test-id/test.directive'; @Component({ selector: 'ix-cell-schedule', templateUrl: './ix-cell-schedule.component.html', changeDetection: ChangeDetectionStrategy.OnPush, standalone: true, - imports: [TestIdModule, ScheduleToCrontabPipe], + imports: [ScheduleToCrontabPipe, TestDirective], }) export class IxCellScheduleComponent extends ColumnComponent {} diff --git a/src/app/modules/ix-table/components/ix-table-body/cells/ix-cell-size/ix-cell-size.component.ts b/src/app/modules/ix-table/components/ix-table-body/cells/ix-cell-size/ix-cell-size.component.ts index 0bbe28076a2..6ec47555541 100644 --- a/src/app/modules/ix-table/components/ix-table-body/cells/ix-cell-size/ix-cell-size.component.ts +++ b/src/app/modules/ix-table/components/ix-table-body/cells/ix-cell-size/ix-cell-size.component.ts @@ -1,14 +1,14 @@ import { ChangeDetectionStrategy, Component } from '@angular/core'; import { ColumnComponent, Column } from 'app/modules/ix-table/interfaces/column-component.class'; import { FileSizePipe } from 'app/modules/pipes/file-size/file-size.pipe'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestDirective } from 'app/modules/test-id/test.directive'; @Component({ selector: 'ix-cell-size', templateUrl: './ix-cell-size.component.html', changeDetection: ChangeDetectionStrategy.OnPush, standalone: true, - imports: [TestIdModule, FileSizePipe], + imports: [FileSizePipe, TestDirective], }) export class IxCellSizeComponent extends ColumnComponent { get size(): number { diff --git a/src/app/modules/ix-table/components/ix-table-body/cells/ix-cell-state-button/ix-cell-state-button.component.ts b/src/app/modules/ix-table/components/ix-table-body/cells/ix-cell-state-button/ix-cell-state-button.component.ts index cf90db151f4..75e2ddce324 100644 --- a/src/app/modules/ix-table/components/ix-table-body/cells/ix-cell-state-button/ix-cell-state-button.component.ts +++ b/src/app/modules/ix-table/components/ix-table-body/cells/ix-cell-state-button/ix-cell-state-button.component.ts @@ -21,7 +21,7 @@ import { DialogService } from 'app/modules/dialog/dialog.service'; import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; import { ColumnComponent, Column } from 'app/modules/ix-table/interfaces/column-component.class'; import { JobSlice, selectJob } from 'app/modules/jobs/store/job.selectors'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestDirective } from 'app/modules/test-id/test.directive'; import { ErrorHandlerService } from 'app/services/error-handler.service'; interface RowState { @@ -42,11 +42,11 @@ interface RowState { standalone: true, imports: [ MatButton, - TestIdModule, NgClass, MatTooltip, IxIconComponent, TranslateModule, + TestDirective, ], }) export class IxCellStateButtonComponent extends ColumnComponent implements OnInit { diff --git a/src/app/modules/ix-table/components/ix-table-body/cells/ix-cell-text/ix-cell-text.component.ts b/src/app/modules/ix-table/components/ix-table-body/cells/ix-cell-text/ix-cell-text.component.ts index 6327adb4e10..92924bc4d69 100644 --- a/src/app/modules/ix-table/components/ix-table-body/cells/ix-cell-text/ix-cell-text.component.ts +++ b/src/app/modules/ix-table/components/ix-table-body/cells/ix-cell-text/ix-cell-text.component.ts @@ -4,7 +4,7 @@ import { import { MatTooltip } from '@angular/material/tooltip'; import { TranslateModule } from '@ngx-translate/core'; import { Column, ColumnComponent } from 'app/modules/ix-table/interfaces/column-component.class'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestDirective } from 'app/modules/test-id/test.directive'; @Component({ selector: 'ix-cell-text', @@ -13,8 +13,8 @@ import { TestIdModule } from 'app/modules/test-id/test-id.module'; standalone: true, imports: [ MatTooltip, - TestIdModule, TranslateModule, + TestDirective, ], }) export class IxCellTextComponent extends ColumnComponent {} diff --git a/src/app/modules/ix-table/components/ix-table-body/cells/ix-cell-toggle/ix-cell-toggle.component.ts b/src/app/modules/ix-table/components/ix-table-body/cells/ix-cell-toggle/ix-cell-toggle.component.ts index 6939cd67ce6..03e4e5decec 100644 --- a/src/app/modules/ix-table/components/ix-table-body/cells/ix-cell-toggle/ix-cell-toggle.component.ts +++ b/src/app/modules/ix-table/components/ix-table-body/cells/ix-cell-toggle/ix-cell-toggle.component.ts @@ -6,7 +6,7 @@ import { Observable } from 'rxjs'; import { RequiresRolesDirective } from 'app/directives/requires-roles/requires-roles.directive'; import { Role } from 'app/enums/role.enum'; import { Column, ColumnComponent } from 'app/modules/ix-table/interfaces/column-component.class'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestDirective } from 'app/modules/test-id/test.directive'; @Component({ selector: 'ix-cell-toggle', @@ -15,10 +15,10 @@ import { TestIdModule } from 'app/modules/test-id/test-id.module'; standalone: true, imports: [ MatSlideToggle, - TestIdModule, RequiresRolesDirective, TranslateModule, AsyncPipe, + TestDirective, ], }) export class IxCellToggleComponent extends ColumnComponent { diff --git a/src/app/modules/ix-table/components/ix-table-body/cells/ix-cell-yes-no/ix-cell-yes-no.component.ts b/src/app/modules/ix-table/components/ix-table-body/cells/ix-cell-yes-no/ix-cell-yes-no.component.ts index 29567bddf7a..619213cf472 100644 --- a/src/app/modules/ix-table/components/ix-table-body/cells/ix-cell-yes-no/ix-cell-yes-no.component.ts +++ b/src/app/modules/ix-table/components/ix-table-body/cells/ix-cell-yes-no/ix-cell-yes-no.component.ts @@ -2,7 +2,7 @@ import { ChangeDetectionStrategy, Component } from '@angular/core'; import { TranslateModule } from '@ngx-translate/core'; import { ColumnComponent, Column } from 'app/modules/ix-table/interfaces/column-component.class'; import { YesNoPipe } from 'app/modules/pipes/yes-no/yes-no.pipe'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestDirective } from 'app/modules/test-id/test.directive'; @Component({ selector: 'ix-cell-yesno', @@ -10,9 +10,9 @@ import { TestIdModule } from 'app/modules/test-id/test-id.module'; changeDetection: ChangeDetectionStrategy.OnPush, standalone: true, imports: [ - TestIdModule, TranslateModule, YesNoPipe, + TestDirective, ], }) export class IxCellYesNoComponent extends ColumnComponent {} diff --git a/src/app/modules/ix-table/components/ix-table-body/ix-table-body.component.ts b/src/app/modules/ix-table/components/ix-table-body/ix-table-body.component.ts index 1b3e7424390..4080b5e867f 100644 --- a/src/app/modules/ix-table/components/ix-table-body/ix-table-body.component.ts +++ b/src/app/modules/ix-table/components/ix-table-body/ix-table-body.component.ts @@ -24,7 +24,7 @@ import { IxTableCellDirective } from 'app/modules/ix-table/directives/ix-table-c import { IxTableDetailsRowDirective } from 'app/modules/ix-table/directives/ix-table-details-row.directive'; import { Column, ColumnComponent } from 'app/modules/ix-table/interfaces/column-component.class'; import { DataProvider } from 'app/modules/ix-table/interfaces/data-provider.interface'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestDirective } from 'app/modules/test-id/test.directive'; @UntilDestroy() @Component({ @@ -34,7 +34,6 @@ import { TestIdModule } from 'app/modules/test-id/test-id.module'; changeDetection: ChangeDetectionStrategy.OnPush, standalone: true, imports: [ - TestIdModule, UiSearchDirective, NgStyle, NgClass, @@ -46,6 +45,7 @@ import { TestIdModule } from 'app/modules/test-id/test-id.module'; MatProgressSpinner, TranslateModule, AsyncPipe, + TestDirective, ], }) export class IxTableBodyComponent implements AfterViewInit { diff --git a/src/app/modules/ix-table/components/ix-table-columns-selector/ix-table-columns-selector.component.ts b/src/app/modules/ix-table/components/ix-table-columns-selector/ix-table-columns-selector.component.ts index 478d6de7532..8e6ed1277f5 100644 --- a/src/app/modules/ix-table/components/ix-table-columns-selector/ix-table-columns-selector.component.ts +++ b/src/app/modules/ix-table/components/ix-table-columns-selector/ix-table-columns-selector.component.ts @@ -10,7 +10,7 @@ import * as _ from 'lodash-es'; import { IxSimpleChanges } from 'app/interfaces/simple-changes.interface'; import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; import { Column, ColumnComponent } from 'app/modules/ix-table/interfaces/column-component.class'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestDirective } from 'app/modules/test-id/test.directive'; @UntilDestroy() @Component({ @@ -21,12 +21,12 @@ import { TestIdModule } from 'app/modules/test-id/test-id.module'; standalone: true, imports: [ MatButton, - TestIdModule, MatMenuTrigger, IxIconComponent, MatMenu, MatMenuItem, TranslateModule, + TestDirective, ], }) export class IxTableColumnsSelectorComponent implements OnChanges { diff --git a/src/app/modules/ix-table/components/ix-table-head/head-cells/ix-header-cell-checkbox/ix-header-cell-checkbox.component.ts b/src/app/modules/ix-table/components/ix-table-head/head-cells/ix-header-cell-checkbox/ix-header-cell-checkbox.component.ts index 24ed893ad0c..c07cccebed4 100644 --- a/src/app/modules/ix-table/components/ix-table-head/head-cells/ix-header-cell-checkbox/ix-header-cell-checkbox.component.ts +++ b/src/app/modules/ix-table/components/ix-table-head/head-cells/ix-header-cell-checkbox/ix-header-cell-checkbox.component.ts @@ -5,7 +5,7 @@ import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy'; import { TranslateModule } from '@ngx-translate/core'; import { map, Observable } from 'rxjs'; import { ColumnComponent } from 'app/modules/ix-table/interfaces/column-component.class'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestDirective } from 'app/modules/test-id/test.directive'; @UntilDestroy() @Component({ @@ -15,9 +15,9 @@ import { TestIdModule } from 'app/modules/test-id/test-id.module'; standalone: true, imports: [ MatCheckbox, - TestIdModule, TranslateModule, AsyncPipe, + TestDirective, ], }) export class IxHeaderCellCheckboxComponent extends ColumnComponent { diff --git a/src/app/modules/ix-table/components/ix-table-head/ix-table-head.component.ts b/src/app/modules/ix-table/components/ix-table-head/ix-table-head.component.ts index f81c9ff0b99..c6b1b9eeafb 100644 --- a/src/app/modules/ix-table/components/ix-table-head/ix-table-head.component.ts +++ b/src/app/modules/ix-table/components/ix-table-head/ix-table-head.component.ts @@ -9,7 +9,7 @@ import { IxTableHeaderCellDirective } from 'app/modules/ix-table/directives/ix-h import { SortDirection } from 'app/modules/ix-table/enums/sort-direction.enum'; import { Column, ColumnComponent } from 'app/modules/ix-table/interfaces/column-component.class'; import { DataProvider } from 'app/modules/ix-table/interfaces/data-provider.interface'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestDirective } from 'app/modules/test-id/test.directive'; @UntilDestroy() @Component({ @@ -19,12 +19,12 @@ import { TestIdModule } from 'app/modules/test-id/test-id.module'; changeDetection: ChangeDetectionStrategy.OnPush, standalone: true, imports: [ - TestIdModule, NgClass, MatTooltip, NgStyle, IxTableHeaderCellDirective, IxIconComponent, + TestDirective, ], }) export class IxTableHeadComponent implements AfterViewInit { diff --git a/src/app/modules/ix-table/components/ix-table-pager-show-more/ix-table-pager-show-more.component.ts b/src/app/modules/ix-table/components/ix-table-pager-show-more/ix-table-pager-show-more.component.ts index 21b6ed11873..f22a05c32f9 100644 --- a/src/app/modules/ix-table/components/ix-table-pager-show-more/ix-table-pager-show-more.component.ts +++ b/src/app/modules/ix-table/components/ix-table-pager-show-more/ix-table-pager-show-more.component.ts @@ -9,7 +9,7 @@ import { Router } from '@angular/router'; import { UntilDestroy } from '@ngneat/until-destroy'; import { TranslateModule } from '@ngx-translate/core'; import { DataProvider } from 'app/modules/ix-table/interfaces/data-provider.interface'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestDirective } from 'app/modules/test-id/test.directive'; @UntilDestroy() @Component({ @@ -20,8 +20,8 @@ import { TestIdModule } from 'app/modules/test-id/test-id.module'; standalone: true, imports: [ MatButton, - TestIdModule, TranslateModule, + TestDirective, ], }) export class IxTablePagerShowMoreComponent implements OnInit, AfterContentChecked { diff --git a/src/app/modules/ix-table/components/ix-table-pager/ix-table-pager.component.ts b/src/app/modules/ix-table/components/ix-table-pager/ix-table-pager.component.ts index dd2e563e557..78c61a988ca 100644 --- a/src/app/modules/ix-table/components/ix-table-pager/ix-table-pager.component.ts +++ b/src/app/modules/ix-table/components/ix-table-pager/ix-table-pager.component.ts @@ -9,7 +9,7 @@ import { UntilDestroy } from '@ngneat/until-destroy'; import { TranslateModule } from '@ngx-translate/core'; import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; import { DataProvider } from 'app/modules/ix-table/interfaces/data-provider.interface'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestDirective } from 'app/modules/test-id/test.directive'; @UntilDestroy() @Component({ @@ -21,11 +21,11 @@ import { TestIdModule } from 'app/modules/test-id/test-id.module'; imports: [ MatFormField, MatSelect, - TestIdModule, MatOption, MatIconButton, IxIconComponent, TranslateModule, + TestDirective, ], }) export class IxTablePagerComponent implements OnInit, AfterContentChecked { diff --git a/src/app/modules/ix-table/components/ix-table/ix-table.component.ts b/src/app/modules/ix-table/components/ix-table/ix-table.component.ts index 4a9db0ee9fe..19d59de8fbf 100644 --- a/src/app/modules/ix-table/components/ix-table/ix-table.component.ts +++ b/src/app/modules/ix-table/components/ix-table/ix-table.component.ts @@ -1,5 +1,5 @@ import { ChangeDetectionStrategy, Component } from '@angular/core'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestDirective } from 'app/modules/test-id/test.directive'; @Component({ selector: 'ix-table', @@ -7,6 +7,8 @@ import { TestIdModule } from 'app/modules/test-id/test-id.module'; styleUrls: ['./ix-table.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush, standalone: true, - imports: [TestIdModule], + imports: [ + TestDirective, + ], }) export class IxTableComponent {} diff --git a/src/app/modules/ix-tree/tree.module.ts b/src/app/modules/ix-tree/tree.module.ts index 58c3909b780..3c1bf3bb338 100644 --- a/src/app/modules/ix-tree/tree.module.ts +++ b/src/app/modules/ix-tree/tree.module.ts @@ -16,7 +16,7 @@ import { TreeNodeDefDirective } from 'app/modules/ix-tree/directives/tree-node-d import { TreeNodeOutletDirective } from 'app/modules/ix-tree/directives/tree-node-outlet.directive'; import { TreeNodeToggleDirective } from 'app/modules/ix-tree/directives/tree-node-toggle.directive'; import { TreeVirtualScrollNodeOutletDirective } from 'app/modules/ix-tree/directives/tree-virtual-scroll-node-outlet.directive'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestDirective } from 'app/modules/test-id/test.directive'; const components = [ NestedTreeNodeComponent, @@ -38,9 +38,9 @@ const components = [ MatTreeModule, ScrollingModule, TranslateModule, - TestIdModule, AngularResizeEventModule, AsyncPipe, + TestDirective, ], declarations: [ ...components, diff --git a/src/app/modules/jobs/components/job-item/job-item.component.ts b/src/app/modules/jobs/components/job-item/job-item.component.ts index 8fd261f50e1..10aa9dfe86c 100644 --- a/src/app/modules/jobs/components/job-item/job-item.component.ts +++ b/src/app/modules/jobs/components/job-item/job-item.component.ts @@ -1,16 +1,37 @@ +import { DecimalPipe } from '@angular/common'; import { Component, ChangeDetectionStrategy, input, output, } from '@angular/core'; +import { MatIconButton } from '@angular/material/button'; +import { MatProgressBar } from '@angular/material/progress-bar'; +import { MatTooltip } from '@angular/material/tooltip'; +import { TranslateModule } from '@ngx-translate/core'; import { JobState } from 'app/enums/job-state.enum'; import { getCredentialsCreationSource } from 'app/helpers/get-credentials-creation-source.utils'; import { credentialTypeLabels } from 'app/interfaces/credential-type.interface'; import { Job } from 'app/interfaces/job.interface'; +import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; +import { FormatDateTimePipe } from 'app/modules/pipes/format-date-time/format-datetime.pipe'; +import { MapValuePipe } from 'app/modules/pipes/map-value/map-value.pipe'; +import { TestDirective } from 'app/modules/test-id/test.directive'; @Component({ selector: 'ix-job-item', templateUrl: './job-item.component.html', styleUrls: ['./job-item.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush, + standalone: true, + imports: [ + MatTooltip, + MatProgressBar, + MatIconButton, + IxIconComponent, + TranslateModule, + FormatDateTimePipe, + MapValuePipe, + DecimalPipe, + TestDirective, + ], }) export class JobItemComponent { readonly job = input.required(); diff --git a/src/app/modules/jobs/components/jobs-panel/jobs-panel.component.ts b/src/app/modules/jobs/components/jobs-panel/jobs-panel.component.ts index eed62339a8b..bb79017cea7 100644 --- a/src/app/modules/jobs/components/jobs-panel/jobs-panel.component.ts +++ b/src/app/modules/jobs/components/jobs-panel/jobs-panel.component.ts @@ -1,16 +1,24 @@ +import { CdkScrollable } from '@angular/cdk/scrolling'; +import { AsyncPipe } from '@angular/common'; import { Component, ChangeDetectionStrategy, } from '@angular/core'; -import { MatDialogRef } from '@angular/material/dialog'; +import { MatButton } from '@angular/material/button'; +import { MatDialogRef, MatDialogContent, MatDialogActions } from '@angular/material/dialog'; +import { MatProgressBar } from '@angular/material/progress-bar'; +import { MatTooltip } from '@angular/material/tooltip'; import { Router } from '@angular/router'; import { untilDestroyed, UntilDestroy } from '@ngneat/until-destroy'; import { Store } from '@ngrx/store'; -import { TranslateService } from '@ngx-translate/core'; +import { TranslateService, TranslateModule } from '@ngx-translate/core'; import { Observable } from 'rxjs'; import { filter, map } from 'rxjs/operators'; +import { LetDirective } from 'app/directives/app-let.directive'; import { ApiJobMethod, ApiJobResponse } from 'app/interfaces/api/api-job-directory.interface'; import { Job } from 'app/interfaces/job.interface'; import { DialogService } from 'app/modules/dialog/dialog.service'; +import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; +import { JobItemComponent } from 'app/modules/jobs/components/job-item/job-item.component'; import { abortJobPressed, jobPanelClosed } from 'app/modules/jobs/store/job.actions'; import { JobSlice, @@ -21,6 +29,7 @@ import { selectJobsPanelSlice, selectJob, } from 'app/modules/jobs/store/job.selectors'; +import { TestDirective } from 'app/modules/test-id/test.directive'; import { ErrorHandlerService } from 'app/services/error-handler.service'; @UntilDestroy() @@ -29,6 +38,21 @@ import { ErrorHandlerService } from 'app/services/error-handler.service'; templateUrl: './jobs-panel.component.html', styleUrls: ['./jobs-panel.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush, + standalone: true, + imports: [ + CdkScrollable, + MatDialogContent, + MatTooltip, + IxIconComponent, + MatProgressBar, + LetDirective, + JobItemComponent, + MatDialogActions, + MatButton, + TranslateModule, + AsyncPipe, + TestDirective, + ], }) export class JobsPanelComponent { isLoading$ = this.store$.select(selectJobState).pipe(map((state) => state.isLoading)); diff --git a/src/app/modules/jobs/jobs.module.ts b/src/app/modules/jobs/jobs.module.ts deleted file mode 100644 index 1f8a04ed523..00000000000 --- a/src/app/modules/jobs/jobs.module.ts +++ /dev/null @@ -1,45 +0,0 @@ -import { AsyncPipe, DecimalPipe } from '@angular/common'; -import { NgModule } from '@angular/core'; -import { MatButtonModule } from '@angular/material/button'; -import { MatDialogModule } from '@angular/material/dialog'; -import { MatProgressBarModule } from '@angular/material/progress-bar'; -import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; -import { MatTooltipModule } from '@angular/material/tooltip'; -import { RouterModule } from '@angular/router'; -import { EffectsModule } from '@ngrx/effects'; -import { StoreModule } from '@ngrx/store'; -import { TranslateModule } from '@ngx-translate/core'; -import { LetDirective } from 'app/directives/app-let.directive'; -import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; -import { JobItemComponent } from 'app/modules/jobs/components/job-item/job-item.component'; -import { JobsPanelComponent } from 'app/modules/jobs/components/jobs-panel/jobs-panel.component'; -import { JobEffects } from 'app/modules/jobs/store/job.effects'; -import { jobReducer } from 'app/modules/jobs/store/job.reducer'; -import { jobStateKey } from 'app/modules/jobs/store/job.selectors'; -import { FormatDateTimePipe } from 'app/modules/pipes/format-date-time/format-datetime.pipe'; -import { MapValuePipe } from 'app/modules/pipes/map-value/map-value.pipe'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; - -@NgModule({ - imports: [ - StoreModule.forFeature(jobStateKey, jobReducer), - EffectsModule.forFeature([JobEffects]), - RouterModule, - TranslateModule, - MatProgressBarModule, - IxIconComponent, - MatButtonModule, - MatTooltipModule, - MatDialogModule, - MatProgressSpinnerModule, - TestIdModule, - FormatDateTimePipe, - MapValuePipe, - DecimalPipe, - AsyncPipe, - LetDirective, - ], - declarations: [JobItemComponent, JobsPanelComponent], - exports: [JobItemComponent, JobsPanelComponent], -}) -export class JobsModule {} diff --git a/src/app/modules/layout/admin-layout/admin-layout.component.ts b/src/app/modules/layout/admin-layout/admin-layout.component.ts index d8ddded5805..7b32de3594c 100644 --- a/src/app/modules/layout/admin-layout/admin-layout.component.ts +++ b/src/app/modules/layout/admin-layout/admin-layout.component.ts @@ -33,7 +33,7 @@ import { SecondaryMenuComponent } from 'app/modules/layout/secondary-menu/second import { TopbarComponent } from 'app/modules/layout/topbar/topbar.component'; import { PageHeaderModule } from 'app/modules/page-header/page-header.module'; import { MapValuePipe } from 'app/modules/pipes/map-value/map-value.pipe'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestDirective } from 'app/modules/test-id/test.directive'; import { LanguageService } from 'app/services/language.service'; import { SentryService } from 'app/services/sentry.service'; import { SessionTimeoutService } from 'app/services/session-timeout.service'; @@ -56,7 +56,6 @@ import { selectBuildYear, waitForSystemInfo } from 'app/store/system-info/system MatSidenav, NgClass, RouterLink, - TestIdModule, IxIconComponent, NavigationComponent, SecondaryMenuComponent, @@ -74,6 +73,7 @@ import { selectBuildYear, waitForSystemInfo } from 'app/store/system-info/system LowerCasePipe, TranslateModule, MapValuePipe, + TestDirective, ], }) export class AdminLayoutComponent implements OnInit, AfterViewInit, OnDestroy { diff --git a/src/app/modules/layout/console-footer/console-panel/console-panel-dialog.component.ts b/src/app/modules/layout/console-footer/console-panel/console-panel-dialog.component.ts index ac67cff273a..48bfabd71bc 100644 --- a/src/app/modules/layout/console-footer/console-panel/console-panel-dialog.component.ts +++ b/src/app/modules/layout/console-footer/console-panel/console-panel-dialog.component.ts @@ -8,7 +8,7 @@ import { MatDialogContent, MatDialogActions, MatDialogClose } from '@angular/mat import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy'; import { TranslateModule } from '@ngx-translate/core'; import { ConsoleMessagesStore } from 'app/modules/layout/console-footer/console-messages.store'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestDirective } from 'app/modules/test-id/test.directive'; @UntilDestroy() @Component({ @@ -23,9 +23,9 @@ import { TestIdModule } from 'app/modules/test-id/test-id.module'; MatDialogActions, MatButton, MatDialogClose, - TestIdModule, AsyncPipe, TranslateModule, + TestDirective, ], }) export class ConsolePanelDialogComponent implements OnInit { diff --git a/src/app/modules/layout/copyright-line/copyright-line.component.ts b/src/app/modules/layout/copyright-line/copyright-line.component.ts index c8a6bf383b3..6873219aef8 100644 --- a/src/app/modules/layout/copyright-line/copyright-line.component.ts +++ b/src/app/modules/layout/copyright-line/copyright-line.component.ts @@ -5,7 +5,7 @@ import { toSignal } from '@angular/core/rxjs-interop'; import { Store } from '@ngrx/store'; import { map, startWith } from 'rxjs'; import { ProductType, productTypeLabels } from 'app/enums/product-type.enum'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestDirective } from 'app/modules/test-id/test.directive'; import { AppsState } from 'app/store'; import { selectBuildYear, selectProductType } from 'app/store/system-info/system-info.selectors'; @@ -15,7 +15,7 @@ import { selectBuildYear, selectProductType } from 'app/store/system-info/system styleUrls: ['./copyright-line.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush, standalone: true, - imports: [TestIdModule], + imports: [TestDirective], }) export class CopyrightLineComponent { readonly withIxLogo = input(false); diff --git a/src/app/modules/layout/navigation/navigation.component.ts b/src/app/modules/layout/navigation/navigation.component.ts index 95481e72a24..5e545182c0a 100644 --- a/src/app/modules/layout/navigation/navigation.component.ts +++ b/src/app/modules/layout/navigation/navigation.component.ts @@ -10,7 +10,7 @@ import { UntilDestroy } from '@ngneat/until-destroy'; import { TranslateModule } from '@ngx-translate/core'; import { MenuItem, MenuItemType, SubMenuItem } from 'app/interfaces/menu-item.interface'; import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestDirective } from 'app/modules/test-id/test.directive'; import { NavigationService } from 'app/services/navigation/navigation.service'; @UntilDestroy() @@ -24,12 +24,12 @@ import { NavigationService } from 'app/services/navigation/navigation.service'; MatNavList, MatListItem, RouterLinkActive, - TestIdModule, RouterLink, MatTooltip, IxIconComponent, AsyncPipe, TranslateModule, + TestDirective, ], }) export class NavigationComponent { diff --git a/src/app/modules/layout/secondary-menu/secondary-menu.component.ts b/src/app/modules/layout/secondary-menu/secondary-menu.component.ts index b6e49bc888d..c39cc35c63e 100644 --- a/src/app/modules/layout/secondary-menu/secondary-menu.component.ts +++ b/src/app/modules/layout/secondary-menu/secondary-menu.component.ts @@ -7,7 +7,7 @@ import { RouterLinkActive, RouterLink } from '@angular/router'; import { TranslateModule } from '@ngx-translate/core'; import { HasAccessDirective } from 'app/directives/has-access/has-access.directive'; import { SubMenuItem } from 'app/interfaces/menu-item.interface'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestDirective } from 'app/modules/test-id/test.directive'; @Component({ selector: 'ix-secondary-menu', @@ -18,11 +18,11 @@ import { TestIdModule } from 'app/modules/test-id/test-id.module'; MatList, MatListItem, RouterLinkActive, - TestIdModule, RouterLink, AsyncPipe, TranslateModule, HasAccessDirective, + TestDirective, ], }) export class SecondaryMenuComponent { diff --git a/src/app/modules/layout/topbar/about-dialog/about-dialog.component.ts b/src/app/modules/layout/topbar/about-dialog/about-dialog.component.ts index e7cc797fffa..53c1612d8cb 100644 --- a/src/app/modules/layout/topbar/about-dialog/about-dialog.component.ts +++ b/src/app/modules/layout/topbar/about-dialog/about-dialog.component.ts @@ -8,7 +8,7 @@ import { helptextAbout } from 'app/helptext/about'; import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; import { CopyrightLineComponent } from 'app/modules/layout/copyright-line/copyright-line.component'; import { MapValuePipe } from 'app/modules/pipes/map-value/map-value.pipe'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestDirective } from 'app/modules/test-id/test.directive'; import { SystemGeneralService } from 'app/services/system-general.service'; @Component({ @@ -23,10 +23,10 @@ import { SystemGeneralService } from 'app/services/system-general.service'; MatDialogActions, CopyrightLineComponent, MatButton, - TestIdModule, TranslateModule, MapValuePipe, LetDirective, + TestDirective, ], }) export class AboutDialogComponent { diff --git a/src/app/modules/layout/topbar/change-password-dialog/change-password-dialog.component.spec.ts b/src/app/modules/layout/topbar/change-password-dialog/change-password-dialog.component.spec.ts index fbc947701da..6dbf82f7b45 100644 --- a/src/app/modules/layout/topbar/change-password-dialog/change-password-dialog.component.spec.ts +++ b/src/app/modules/layout/topbar/change-password-dialog/change-password-dialog.component.spec.ts @@ -10,7 +10,6 @@ import { mockCall, mockWebSocket } from 'app/core/testing/utils/mock-websocket.u import { FormErrorHandlerService } from 'app/modules/forms/ix-forms/services/form-error-handler.service'; import { IxFormHarness } from 'app/modules/forms/ix-forms/testing/ix-form.harness'; import { ChangePasswordDialogComponent } from 'app/modules/layout/topbar/change-password-dialog/change-password-dialog.component'; -import { AppLoaderModule } from 'app/modules/loader/app-loader.module'; import { WebSocketService } from 'app/services/ws.service'; describe('ChangePasswordDialogComponent', () => { @@ -21,7 +20,6 @@ describe('ChangePasswordDialogComponent', () => { component: ChangePasswordDialogComponent, imports: [ ReactiveFormsModule, - AppLoaderModule, ], providers: [ mockWebSocket([ diff --git a/src/app/modules/layout/topbar/change-password-dialog/change-password-dialog.component.ts b/src/app/modules/layout/topbar/change-password-dialog/change-password-dialog.component.ts index 34ef808c7d4..9e390c717a9 100644 --- a/src/app/modules/layout/topbar/change-password-dialog/change-password-dialog.component.ts +++ b/src/app/modules/layout/topbar/change-password-dialog/change-password-dialog.component.ts @@ -13,7 +13,7 @@ import { FormErrorHandlerService } from 'app/modules/forms/ix-forms/services/for import { matchOthersFgValidator } from 'app/modules/forms/ix-forms/validators/password-validation/password-validation'; import { AppLoaderService } from 'app/modules/loader/app-loader.service'; import { SnackbarService } from 'app/modules/snackbar/services/snackbar.service'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestDirective } from 'app/modules/test-id/test.directive'; import { AuthService } from 'app/services/auth/auth.service'; import { WebSocketService } from 'app/services/ws.service'; @@ -31,8 +31,8 @@ import { WebSocketService } from 'app/services/ws.service'; FormActionsComponent, MatButton, MatDialogClose, - TestIdModule, TranslateModule, + TestDirective, ], }) export class ChangePasswordDialogComponent { diff --git a/src/app/modules/layout/topbar/checkin-indicator/checkin-indicator.component.ts b/src/app/modules/layout/topbar/checkin-indicator/checkin-indicator.component.ts index 2340705ec45..962790f77a2 100644 --- a/src/app/modules/layout/topbar/checkin-indicator/checkin-indicator.component.ts +++ b/src/app/modules/layout/topbar/checkin-indicator/checkin-indicator.component.ts @@ -11,7 +11,7 @@ import { helptextInterfaces } from 'app/helptext/network/interfaces/interfaces-l import { helptextTopbar } from 'app/helptext/topbar'; import { DialogService } from 'app/modules/dialog/dialog.service'; import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestDirective } from 'app/modules/test-id/test.directive'; import { AppsState } from 'app/store'; import { checkinIndicatorPressed } from 'app/store/network-interfaces/network-interfaces.actions'; import { @@ -27,11 +27,11 @@ import { standalone: true, imports: [ MatIconButton, - TestIdModule, MatTooltip, IxIconComponent, AsyncPipe, TranslateModule, + TestDirective, ], }) export class CheckinIndicatorComponent implements OnInit { diff --git a/src/app/modules/layout/topbar/directory-services-indicator/directory-services-indicator.component.ts b/src/app/modules/layout/topbar/directory-services-indicator/directory-services-indicator.component.ts index 6b3f2910879..20ebd359e1d 100644 --- a/src/app/modules/layout/topbar/directory-services-indicator/directory-services-indicator.component.ts +++ b/src/app/modules/layout/topbar/directory-services-indicator/directory-services-indicator.component.ts @@ -15,7 +15,7 @@ import { DirectoryServicesMonitorComponent, } from 'app/modules/layout/topbar/directory-services-indicator/directory-services-monitor/directory-services-monitor.component'; import { topbarDialogPosition } from 'app/modules/layout/topbar/topbar-dialog-position.constant'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestDirective } from 'app/modules/test-id/test.directive'; import { WebSocketService } from 'app/services/ws.service'; @UntilDestroy() @@ -26,10 +26,10 @@ import { WebSocketService } from 'app/services/ws.service'; standalone: true, imports: [ MatIconButton, - TestIdModule, MatTooltip, IxIconComponent, TranslateModule, + TestDirective, ], }) export class DirectoryServicesIndicatorComponent implements OnInit, OnDestroy { diff --git a/src/app/modules/layout/topbar/directory-services-indicator/directory-services-monitor/directory-services-monitor.component.ts b/src/app/modules/layout/topbar/directory-services-indicator/directory-services-monitor/directory-services-monitor.component.ts index 892034fbcf6..e7f3843bd09 100644 --- a/src/app/modules/layout/topbar/directory-services-indicator/directory-services-monitor/directory-services-monitor.component.ts +++ b/src/app/modules/layout/topbar/directory-services-indicator/directory-services-monitor/directory-services-monitor.component.ts @@ -13,7 +13,7 @@ import { finalize } from 'rxjs'; import { DirectoryServiceState, directoryServiceStateLabels } from 'app/enums/directory-service-state.enum'; import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; import { MapValuePipe } from 'app/modules/pipes/map-value/map-value.pipe'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestDirective } from 'app/modules/test-id/test.directive'; import { ErrorHandlerService } from 'app/services/error-handler.service'; import { WebSocketService } from 'app/services/ws.service'; @@ -28,13 +28,13 @@ import { WebSocketService } from 'app/services/ws.service'; CdkScrollable, MatDialogContent, MatIconButton, - TestIdModule, IxIconComponent, MatDialogClose, MatProgressSpinner, RouterLink, TranslateModule, MapValuePipe, + TestDirective, ], }) export class DirectoryServicesMonitorComponent implements OnInit { diff --git a/src/app/modules/layout/topbar/failover-upgrade-indicator/failover-upgrade-indicator.component.ts b/src/app/modules/layout/topbar/failover-upgrade-indicator/failover-upgrade-indicator.component.ts index 778f8aa2058..5636b02f807 100644 --- a/src/app/modules/layout/topbar/failover-upgrade-indicator/failover-upgrade-indicator.component.ts +++ b/src/app/modules/layout/topbar/failover-upgrade-indicator/failover-upgrade-indicator.component.ts @@ -7,7 +7,7 @@ import { TranslateModule } from '@ngx-translate/core'; import { RequiresRolesDirective } from 'app/directives/requires-roles/requires-roles.directive'; import { Role } from 'app/enums/role.enum'; import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestDirective } from 'app/modules/test-id/test.directive'; import { selectIsUpgradePending } from 'app/store/ha-info/ha-info.selectors'; import { updatePendingIndicatorPressed } from 'app/store/ha-upgrade/ha-upgrade.actions'; @@ -18,12 +18,12 @@ import { updatePendingIndicatorPressed } from 'app/store/ha-upgrade/ha-upgrade.a standalone: true, imports: [ MatIconButton, - TestIdModule, MatTooltip, IxIconComponent, AsyncPipe, TranslateModule, RequiresRolesDirective, + TestDirective, ], }) export class FailoverUpgradeIndicatorComponent { diff --git a/src/app/modules/layout/topbar/ha-status-icon/ha-status-icon.component.ts b/src/app/modules/layout/topbar/ha-status-icon/ha-status-icon.component.ts index 9d281a5b23c..03333f04510 100644 --- a/src/app/modules/layout/topbar/ha-status-icon/ha-status-icon.component.ts +++ b/src/app/modules/layout/topbar/ha-status-icon/ha-status-icon.component.ts @@ -15,7 +15,7 @@ import { HaStatusPopoverComponent, } from 'app/modules/layout/topbar/ha-status-icon/ha-status-popover/ha-status-popover.component'; import { topbarDialogPosition } from 'app/modules/layout/topbar/topbar-dialog-position.constant'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestDirective } from 'app/modules/test-id/test.directive'; import { AppsState } from 'app/store'; import { selectHaStatus, selectIsHaLicensed } from 'app/store/ha-info/ha-info.selectors'; @@ -27,11 +27,11 @@ import { selectHaStatus, selectIsHaLicensed } from 'app/store/ha-info/ha-info.se standalone: true, imports: [ MatIconButton, - TestIdModule, MatTooltip, IxIconComponent, AsyncPipe, TranslateModule, + TestDirective, ], }) export class HaStatusIconComponent implements OnInit { diff --git a/src/app/modules/layout/topbar/ix-logo/ix-logo.component.ts b/src/app/modules/layout/topbar/ix-logo/ix-logo.component.ts index 1a63814f8c1..9e379fd8b75 100644 --- a/src/app/modules/layout/topbar/ix-logo/ix-logo.component.ts +++ b/src/app/modules/layout/topbar/ix-logo/ix-logo.component.ts @@ -4,7 +4,7 @@ import { ChangeDetectionStrategy, Component } from '@angular/core'; import { combineLatest } from 'rxjs'; import { map } from 'rxjs/operators'; import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestDirective } from 'app/modules/test-id/test.directive'; import { ThemeService } from 'app/services/theme/theme.service'; @Component({ @@ -14,9 +14,9 @@ import { ThemeService } from 'app/services/theme/theme.service'; changeDetection: ChangeDetectionStrategy.OnPush, standalone: true, imports: [ - TestIdModule, IxIconComponent, AsyncPipe, + TestDirective, ], }) export class IxLogoComponent { diff --git a/src/app/modules/layout/topbar/jobs-indicator/jobs-indicator.component.ts b/src/app/modules/layout/topbar/jobs-indicator/jobs-indicator.component.ts index 6ed846f07c8..716efada7d8 100644 --- a/src/app/modules/layout/topbar/jobs-indicator/jobs-indicator.component.ts +++ b/src/app/modules/layout/topbar/jobs-indicator/jobs-indicator.component.ts @@ -17,7 +17,7 @@ import { jobPanelClosed } from 'app/modules/jobs/store/job.actions'; import { selectIsJobPanelOpen, selectRunningJobsCount } from 'app/modules/jobs/store/job.selectors'; import { jobsElements } from 'app/modules/layout/topbar/jobs-indicator/jobs-indicator.elements'; import { topbarDialogPosition } from 'app/modules/layout/topbar/topbar-dialog-position.constant'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestDirective } from 'app/modules/test-id/test.directive'; import { AppsState } from 'app/store'; import { jobIndicatorPressed } from 'app/store/topbar/topbar.actions'; @@ -29,7 +29,6 @@ import { jobIndicatorPressed } from 'app/store/topbar/topbar.actions'; standalone: true, imports: [ MatIconButton, - TestIdModule, MatBadge, MatTooltip, IxIconComponent, @@ -37,6 +36,7 @@ import { jobIndicatorPressed } from 'app/store/topbar/topbar.actions'; TranslateModule, LetDirective, UiSearchDirective, + TestDirective, ], }) export class JobsIndicatorComponent implements OnInit { diff --git a/src/app/modules/layout/topbar/power-menu/power-menu.component.ts b/src/app/modules/layout/topbar/power-menu/power-menu.component.ts index d37632cf9c6..a96a9ac95ba 100644 --- a/src/app/modules/layout/topbar/power-menu/power-menu.component.ts +++ b/src/app/modules/layout/topbar/power-menu/power-menu.component.ts @@ -13,7 +13,7 @@ import { helptextTopbar } from 'app/helptext/topbar'; import { DialogService } from 'app/modules/dialog/dialog.service'; import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; import { powerMenuElements } from 'app/modules/layout/topbar/power-menu/power-menu.elements'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestDirective } from 'app/modules/test-id/test.directive'; @UntilDestroy() @Component({ @@ -23,7 +23,6 @@ import { TestIdModule } from 'app/modules/test-id/test-id.module'; standalone: true, imports: [ MatIconButton, - TestIdModule, MatTooltip, MatMenuTrigger, IxIconComponent, @@ -32,6 +31,7 @@ import { TestIdModule } from 'app/modules/test-id/test-id.module'; TranslateModule, RequiresRolesDirective, UiSearchDirective, + TestDirective, ], }) export class PowerMenuComponent { diff --git a/src/app/modules/layout/topbar/resilvering-indicator/resilver-progress/resilver-progress.component.ts b/src/app/modules/layout/topbar/resilvering-indicator/resilver-progress/resilver-progress.component.ts index b901cd2c9dd..53ec60191bd 100644 --- a/src/app/modules/layout/topbar/resilvering-indicator/resilver-progress/resilver-progress.component.ts +++ b/src/app/modules/layout/topbar/resilvering-indicator/resilver-progress/resilver-progress.component.ts @@ -13,7 +13,7 @@ import { TranslateService, TranslateModule } from '@ngx-translate/core'; import { PoolScanFunction } from 'app/enums/pool-scan-function.enum'; import { PoolScanState } from 'app/enums/pool-scan-state.enum'; import { PoolScan } from 'app/interfaces/resilver-job.interface'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestDirective } from 'app/modules/test-id/test.directive'; import { WebSocketService } from 'app/services/ws.service'; @UntilDestroy() @@ -31,9 +31,9 @@ import { WebSocketService } from 'app/services/ws.service'; MatDialogActions, MatButton, MatDialogClose, - TestIdModule, DecimalPipe, TranslateModule, + TestDirective, ], }) export class ResilverProgressDialogComponent implements OnInit { diff --git a/src/app/modules/layout/topbar/resilvering-indicator/resilvering-indicator.component.ts b/src/app/modules/layout/topbar/resilvering-indicator/resilvering-indicator.component.ts index 82e97d0c585..21f2c7acf1a 100644 --- a/src/app/modules/layout/topbar/resilvering-indicator/resilvering-indicator.component.ts +++ b/src/app/modules/layout/topbar/resilvering-indicator/resilvering-indicator.component.ts @@ -12,7 +12,7 @@ import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; import { ResilverProgressDialogComponent, } from 'app/modules/layout/topbar/resilvering-indicator/resilver-progress/resilver-progress.component'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestDirective } from 'app/modules/test-id/test.directive'; import { WebSocketService } from 'app/services/ws.service'; @Component({ @@ -23,11 +23,11 @@ import { WebSocketService } from 'app/services/ws.service'; standalone: true, imports: [ MatIconButton, - TestIdModule, MatTooltip, IxIconComponent, AsyncPipe, TranslateModule, + TestDirective, ], }) export class ResilveringIndicatorComponent { diff --git a/src/app/modules/layout/topbar/topbar.component.ts b/src/app/modules/layout/topbar/topbar.component.ts index df642f18820..cb54b494476 100644 --- a/src/app/modules/layout/topbar/topbar.component.ts +++ b/src/app/modules/layout/topbar/topbar.component.ts @@ -35,7 +35,7 @@ import { ResilveringIndicatorComponent } from 'app/modules/layout/topbar/resilve import { topbarDialogPosition } from 'app/modules/layout/topbar/topbar-dialog-position.constant'; import { toolBarElements } from 'app/modules/layout/topbar/topbar.elements'; import { UserMenuComponent } from 'app/modules/layout/topbar/user-menu/user-menu.component'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestDirective } from 'app/modules/test-id/test.directive'; import { TruecommandModule } from 'app/modules/truecommand/truecommand.module'; import { SystemGeneralService } from 'app/services/system-general.service'; import { ThemeService } from 'app/services/theme/theme.service'; @@ -54,7 +54,6 @@ import { alertIndicatorPressed, sidenavIndicatorPressed } from 'app/store/topbar MatToolbar, MatToolbarRow, MatIconButton, - TestIdModule, MatTooltip, IxIconComponent, GlobalSearchModule, @@ -74,6 +73,7 @@ import { alertIndicatorPressed, sidenavIndicatorPressed } from 'app/store/topbar TranslateModule, LetDirective, UiSearchDirective, + TestDirective, ], }) export class TopbarComponent implements OnInit { diff --git a/src/app/modules/layout/topbar/user-menu/user-menu.component.ts b/src/app/modules/layout/topbar/user-menu/user-menu.component.ts index 7ebc90ec599..37a1eee0933 100644 --- a/src/app/modules/layout/topbar/user-menu/user-menu.component.ts +++ b/src/app/modules/layout/topbar/user-menu/user-menu.component.ts @@ -20,7 +20,7 @@ import { ChangePasswordDialogComponent, } from 'app/modules/layout/topbar/change-password-dialog/change-password-dialog.component'; import { userMenuElements } from 'app/modules/layout/topbar/user-menu/user-menu.elements'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestDirective } from 'app/modules/test-id/test.directive'; import { AuthService } from 'app/services/auth/auth.service'; @UntilDestroy() @@ -32,7 +32,6 @@ import { AuthService } from 'app/services/auth/auth.service'; standalone: true, imports: [ MatIconButton, - TestIdModule, MatTooltip, MatMenuTrigger, IxIconComponent, @@ -43,6 +42,7 @@ import { AuthService } from 'app/services/auth/auth.service'; AsyncPipe, TranslateModule, UiSearchDirective, + TestDirective, ], }) export class UserMenuComponent { diff --git a/src/app/modules/lists/dual-list/dual-list.module.ts b/src/app/modules/lists/dual-list/dual-list.module.ts index 362e0b84d72..e9d748abc00 100644 --- a/src/app/modules/lists/dual-list/dual-list.module.ts +++ b/src/app/modules/lists/dual-list/dual-list.module.ts @@ -5,7 +5,7 @@ import { MatButtonModule } from '@angular/material/button'; import { MatListModule } from '@angular/material/list'; import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; import { DualListboxComponent } from 'app/modules/lists/dual-list/dual-list.component'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestDirective } from 'app/modules/test-id/test.directive'; @NgModule({ declarations: [DualListboxComponent], @@ -14,8 +14,8 @@ import { TestIdModule } from 'app/modules/test-id/test-id.module'; MatListModule, IxIconComponent, DragDropModule, - TestIdModule, NgTemplateOutlet, + TestDirective, ], exports: [DualListboxComponent], }) diff --git a/src/app/modules/lists/ordered-list/ordered-list.module.ts b/src/app/modules/lists/ordered-list/ordered-list.module.ts index 47b2ea1c3b2..ff3a1597b36 100644 --- a/src/app/modules/lists/ordered-list/ordered-list.module.ts +++ b/src/app/modules/lists/ordered-list/ordered-list.module.ts @@ -8,7 +8,7 @@ import { IxErrorsComponent } from 'app/modules/forms/ix-forms/components/ix-erro import { IxLabelComponent } from 'app/modules/forms/ix-forms/components/ix-label/ix-label.component'; import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; import { OrderedListboxComponent } from 'app/modules/lists/ordered-list/ordered-list.component'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestDirective } from 'app/modules/test-id/test.directive'; @NgModule({ declarations: [OrderedListboxComponent], @@ -17,11 +17,11 @@ import { TestIdModule } from 'app/modules/test-id/test-id.module'; MatListModule, IxIconComponent, DragDropModule, - TestIdModule, MatSlideToggleModule, TranslateModule, IxLabelComponent, IxErrorsComponent, + TestDirective, ], exports: [OrderedListboxComponent], }) diff --git a/src/app/modules/loader/app-loader.module.ts b/src/app/modules/loader/app-loader.module.ts deleted file mode 100644 index 22bb5b8f9f9..00000000000 --- a/src/app/modules/loader/app-loader.module.ts +++ /dev/null @@ -1,38 +0,0 @@ -import { NgModule } from '@angular/core'; -import { MatDialogModule } from '@angular/material/dialog'; -import { MatProgressBarModule } from '@angular/material/progress-bar'; -import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; -import { TranslateModule } from '@ngx-translate/core'; -import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader'; -import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; -import { AppLoaderService } from 'app/modules/loader/app-loader.service'; -import { AppLoaderComponent } from 'app/modules/loader/components/app-loader/app-loader.component'; -import { FakeProgressBarComponent } from 'app/modules/loader/components/fake-progress-bar/fake-progress-bar.component'; -import { WithLoadingStateDirective } from 'app/modules/loader/directives/with-loading-state/with-loading-state.directive'; -import { WithLoadingStateErrorComponent } from './directives/with-loading-state/with-loading-state-error/with-loading-state-error.component'; -import { WithLoadingStateLoaderComponent } from './directives/with-loading-state/with-loading-state-loader/with-loading-state-loader.component'; - -@NgModule({ - imports: [ - MatDialogModule, - IxIconComponent, - MatProgressSpinnerModule, - TranslateModule, - MatProgressBarModule, - NgxSkeletonLoaderModule, - ], - providers: [AppLoaderService], - declarations: [ - AppLoaderComponent, - FakeProgressBarComponent, - WithLoadingStateDirective, - WithLoadingStateErrorComponent, - WithLoadingStateLoaderComponent, - ], - exports: [ - AppLoaderComponent, - FakeProgressBarComponent, - WithLoadingStateDirective, - ], -}) -export class AppLoaderModule { } diff --git a/src/app/modules/loader/components/app-loader/app-loader.component.ts b/src/app/modules/loader/components/app-loader/app-loader.component.ts index b1e46c700a5..4d9199021eb 100644 --- a/src/app/modules/loader/components/app-loader/app-loader.component.ts +++ b/src/app/modules/loader/components/app-loader/app-loader.component.ts @@ -1,12 +1,23 @@ +import { CdkScrollable } from '@angular/cdk/scrolling'; import { Component, Input, ChangeDetectionStrategy, } from '@angular/core'; +import { MatDialogContent } from '@angular/material/dialog'; +import { MatProgressSpinner } from '@angular/material/progress-spinner'; +import { TranslateModule } from '@ngx-translate/core'; @Component({ selector: 'ix-app-loader', templateUrl: './app-loader.component.html', styleUrls: ['./app-loader.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush, + standalone: true, + imports: [ + CdkScrollable, + MatDialogContent, + MatProgressSpinner, + TranslateModule, + ], }) export class AppLoaderComponent { @Input() title: string; diff --git a/src/app/modules/loader/components/fake-progress-bar/fake-progress-bar.component.ts b/src/app/modules/loader/components/fake-progress-bar/fake-progress-bar.component.ts index 2038c38eb51..b6b3f79dede 100644 --- a/src/app/modules/loader/components/fake-progress-bar/fake-progress-bar.component.ts +++ b/src/app/modules/loader/components/fake-progress-bar/fake-progress-bar.component.ts @@ -9,6 +9,7 @@ import { OnChanges, OnDestroy, } from '@angular/core'; +import { MatProgressBar } from '@angular/material/progress-bar'; import { interval, Subject } from 'rxjs'; import { map, takeUntil } from 'rxjs/operators'; import { IxSimpleChanges } from 'app/interfaces/simple-changes.interface'; @@ -29,6 +30,8 @@ import { IxSimpleChanges } from 'app/interfaces/simple-changes.interface'; ]), ]), ], + standalone: true, + imports: [MatProgressBar], }) export class FakeProgressBarComponent implements OnChanges, OnDestroy { @Input() loading: boolean; diff --git a/src/app/modules/loader/directives/with-loading-state/with-loading-state-error/with-loading-state-error.component.ts b/src/app/modules/loader/directives/with-loading-state/with-loading-state-error/with-loading-state-error.component.ts index 499e54c0639..bcd1014a465 100644 --- a/src/app/modules/loader/directives/with-loading-state/with-loading-state-error/with-loading-state-error.component.ts +++ b/src/app/modules/loader/directives/with-loading-state/with-loading-state-error/with-loading-state-error.component.ts @@ -1,6 +1,7 @@ import { ChangeDetectionStrategy, Component, Input, } from '@angular/core'; +import { TranslateModule } from '@ngx-translate/core'; import { isWebSocketError } from 'app/helpers/websocket.helper'; import { WebSocketError } from 'app/interfaces/websocket-error.interface'; @@ -8,6 +9,8 @@ import { WebSocketError } from 'app/interfaces/websocket-error.interface'; selector: 'ix-with-loading-state-error', templateUrl: './with-loading-state-error.component.html', changeDetection: ChangeDetectionStrategy.OnPush, + standalone: true, + imports: [TranslateModule], }) export class WithLoadingStateErrorComponent { @Input() error: Error | WebSocketError; diff --git a/src/app/modules/loader/directives/with-loading-state/with-loading-state-loader/with-loading-state-loader.component.ts b/src/app/modules/loader/directives/with-loading-state/with-loading-state-loader/with-loading-state-loader.component.ts index cf6a008cb38..68bc46be92a 100644 --- a/src/app/modules/loader/directives/with-loading-state/with-loading-state-loader/with-loading-state-loader.component.ts +++ b/src/app/modules/loader/directives/with-loading-state/with-loading-state-loader/with-loading-state-loader.component.ts @@ -1,9 +1,12 @@ import { ChangeDetectionStrategy, Component } from '@angular/core'; +import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader'; @Component({ selector: 'ix-with-loading-state-loader', templateUrl: './with-loading-state-loader.component.html', styleUrls: ['./with-loading-state-loader.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush, + standalone: true, + imports: [NgxSkeletonLoaderModule], }) export class WithLoadingStateLoaderComponent {} diff --git a/src/app/modules/loader/directives/with-loading-state/with-loading-state.directive.ts b/src/app/modules/loader/directives/with-loading-state/with-loading-state.directive.ts index 7816e1c700a..73ee3e83a1c 100644 --- a/src/app/modules/loader/directives/with-loading-state/with-loading-state.directive.ts +++ b/src/app/modules/loader/directives/with-loading-state/with-loading-state.directive.ts @@ -21,6 +21,7 @@ import { */ @Directive({ selector: '[ixWithLoadingState]', + standalone: true, }) export class WithLoadingStateDirective implements OnDestroy { renderSubscription: Subscription; diff --git a/src/app/modules/page-header/page-header.module.ts b/src/app/modules/page-header/page-header.module.ts index a232c3c3bbb..c1a3536e583 100644 --- a/src/app/modules/page-header/page-header.module.ts +++ b/src/app/modules/page-header/page-header.module.ts @@ -4,24 +4,24 @@ import { MatButton } from '@angular/material/button'; import { RouterModule } from '@angular/router'; import { TranslateModule } from '@ngx-translate/core'; import { IfNightlyDirective } from 'app/directives/if-nightly/if-nightly.directive'; -import { AppLoaderModule } from 'app/modules/loader/app-loader.module'; +import { FakeProgressBarComponent } from 'app/modules/loader/components/fake-progress-bar/fake-progress-bar.component'; import { BreadcrumbComponent } from 'app/modules/page-header/breadcrumb/breadcrumb.component'; import { DefaultPageHeaderComponent, } from 'app/modules/page-header/default-page-header/default-page-header.component'; import { PageHeaderComponent } from 'app/modules/page-header/page-title-header/page-header.component'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestDirective } from 'app/modules/test-id/test.directive'; import { NewPageBadgeComponent } from './is-new-indicator/new-page-badge.component'; @NgModule({ imports: [ RouterModule, TranslateModule, - TestIdModule, - AppLoaderModule, MatButton, AsyncPipe, IfNightlyDirective, + FakeProgressBarComponent, + TestDirective, ], declarations: [ BreadcrumbComponent, diff --git a/src/app/modules/scheduler/scheduler.module.ts b/src/app/modules/scheduler/scheduler.module.ts index 25cf20c536a..23ba6f17e56 100644 --- a/src/app/modules/scheduler/scheduler.module.ts +++ b/src/app/modules/scheduler/scheduler.module.ts @@ -26,7 +26,7 @@ import { SchedulerPreviewColumnComponent, } from 'app/modules/scheduler/components/scheduler-modal/scheduler-preview-column/scheduler-preview-column.component'; import { CrontabExplanationPipe } from 'app/modules/scheduler/pipes/crontab-explanation.pipe'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestDirective } from 'app/modules/test-id/test.directive'; import { TooltipComponent } from 'app/modules/tooltip/tooltip.component'; @NgModule({ @@ -42,7 +42,6 @@ import { TooltipComponent } from 'app/modules/tooltip/tooltip.component'; MatDialogModule, MatButtonModule, MatCheckboxModule, - TestIdModule, TooltipComponent, CastPipe, IxSelectComponent, @@ -51,6 +50,7 @@ import { TooltipComponent } from 'app/modules/tooltip/tooltip.component'; IxErrorsComponent, SlicePipe, AsyncPipe, + TestDirective, ], exports: [ SchedulerComponent, diff --git a/src/app/modules/snackbar/snackbar.module.ts b/src/app/modules/snackbar/snackbar.module.ts index 280ac0cfc58..ef23806aa24 100644 --- a/src/app/modules/snackbar/snackbar.module.ts +++ b/src/app/modules/snackbar/snackbar.module.ts @@ -4,7 +4,7 @@ import { MAT_SNACK_BAR_DEFAULT_OPTIONS, MatSnackBarConfig, MatSnackBarModule } f import { TranslateModule } from '@ngx-translate/core'; import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; import { SnackbarComponent } from 'app/modules/snackbar/components/snackbar/snackbar.component'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestDirective } from 'app/modules/test-id/test.directive'; @NgModule({ imports: [ @@ -13,7 +13,7 @@ import { TestIdModule } from 'app/modules/test-id/test-id.module'; MatSnackBarModule, TranslateModule, MatSnackBarModule, - TestIdModule, + TestDirective, ], exports: [], declarations: [ diff --git a/src/app/modules/summary/summary.component.ts b/src/app/modules/summary/summary.component.ts index be61978eeb5..cdd39c0d290 100644 --- a/src/app/modules/summary/summary.component.ts +++ b/src/app/modules/summary/summary.component.ts @@ -3,7 +3,7 @@ import { } from '@angular/core'; import { TranslateModule } from '@ngx-translate/core'; import { SummarySection } from 'app/modules/summary/summary.interface'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestDirective } from 'app/modules/test-id/test.directive'; @Component({ selector: 'ix-summary', @@ -12,8 +12,8 @@ import { TestIdModule } from 'app/modules/test-id/test-id.module'; changeDetection: ChangeDetectionStrategy.OnPush, standalone: true, imports: [ - TestIdModule, TranslateModule, + TestDirective, ], }) export class SummaryComponent { diff --git a/src/app/modules/terminal/terminal.module.ts b/src/app/modules/terminal/terminal.module.ts index f3aa016dacb..f6a1895c9d6 100644 --- a/src/app/modules/terminal/terminal.module.ts +++ b/src/app/modules/terminal/terminal.module.ts @@ -8,7 +8,7 @@ import { ToolbarSliderComponent } from 'app/modules/forms/toolbar-slider/toolbar import { PageHeaderModule } from 'app/modules/page-header/page-header.module'; import { CopyPasteMessageComponent } from 'app/modules/terminal/components/copy-paste-message/copy-paste-message.component'; import { TerminalComponent } from 'app/modules/terminal/components/terminal/terminal.component'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestDirective } from 'app/modules/test-id/test.directive'; import { TooltipComponent } from 'app/modules/tooltip/tooltip.component'; @NgModule({ @@ -16,12 +16,12 @@ import { TooltipComponent } from 'app/modules/tooltip/tooltip.component'; EntityModule, TranslateModule, MatButtonModule, - TestIdModule, MatDialogModule, ToolbarSliderComponent, TooltipComponent, PageHeaderModule, NgStyle, + TestDirective, ], declarations: [ TerminalComponent, diff --git a/src/app/modules/test-id/test-id.module.ts b/src/app/modules/test-id/test-id.module.ts deleted file mode 100644 index 761802700f8..00000000000 --- a/src/app/modules/test-id/test-id.module.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { NgModule } from '@angular/core'; -import { TestDirective } from 'app/modules/test-id/test/test.directive'; -import { TestOverrideDirective } from 'app/modules/test-id/test-override/test-override.directive'; - -@NgModule({ - declarations: [ - TestDirective, - TestOverrideDirective, - ], - exports: [ - TestDirective, - TestOverrideDirective, - ], -}) -export class TestIdModule {} diff --git a/src/app/modules/test-id/test-override/test-override.directive.ts b/src/app/modules/test-id/test-override/test-override.directive.ts index 753b796cb77..ddf11b60455 100644 --- a/src/app/modules/test-id/test-override/test-override.directive.ts +++ b/src/app/modules/test-id/test-override/test-override.directive.ts @@ -10,6 +10,7 @@ import { */ @Directive({ selector: '[ixTestOverride]', + standalone: true, }) export class TestOverrideDirective { @Input('ixTestOverride') overrideDescription: number | string | (string | number)[]; diff --git a/src/app/modules/test-id/test/test.directive.ts b/src/app/modules/test-id/test.directive.ts similarity index 99% rename from src/app/modules/test-id/test/test.directive.ts rename to src/app/modules/test-id/test.directive.ts index 62ed0606856..7d91bb3bab8 100644 --- a/src/app/modules/test-id/test/test.directive.ts +++ b/src/app/modules/test-id/test.directive.ts @@ -19,6 +19,7 @@ import { TestOverrideDirective } from 'app/modules/test-id/test-override/test-ov */ @Directive({ selector: '[ixTest]', + standalone: true, }) export class TestDirective { @Input('ixTest') description: number | string | (string | number)[]; diff --git a/src/app/modules/tooltip/tooltip.component.ts b/src/app/modules/tooltip/tooltip.component.ts index a2b46b24706..b121a56e2a3 100644 --- a/src/app/modules/tooltip/tooltip.component.ts +++ b/src/app/modules/tooltip/tooltip.component.ts @@ -5,7 +5,7 @@ import { TranslateModule } from '@ngx-translate/core'; import { NgxPopperjsModule } from 'ngx-popperjs'; import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; import { CastPipe } from 'app/modules/pipes/cast/cast.pipe'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestDirective } from 'app/modules/test-id/test.directive'; @Component({ selector: 'ix-tooltip', @@ -17,8 +17,8 @@ import { TestIdModule } from 'app/modules/test-id/test-id.module'; NgxPopperjsModule, TranslateModule, IxIconComponent, - TestIdModule, CastPipe, + TestDirective, ], }) export class TooltipComponent { diff --git a/src/app/modules/truecommand/truecommand.module.ts b/src/app/modules/truecommand/truecommand.module.ts index 07ddbf48840..813cb229790 100644 --- a/src/app/modules/truecommand/truecommand.module.ts +++ b/src/app/modules/truecommand/truecommand.module.ts @@ -14,7 +14,7 @@ import { FormActionsComponent } from 'app/modules/forms/ix-forms/components/form import { IxCheckboxComponent } from 'app/modules/forms/ix-forms/components/ix-checkbox/ix-checkbox.component'; import { IxInputComponent } from 'app/modules/forms/ix-forms/components/ix-input/ix-input.component'; import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestDirective } from 'app/modules/test-id/test.directive'; import { TruecommandConnectModalComponent } from 'app/modules/truecommand/components/truecommand-connect-modal/truecommand-connect-modal.component'; import { TruecommandStatusModalComponent } from 'app/modules/truecommand/components/truecommand-status-modal/truecommand-status-modal.component'; import { TruecommandButtonComponent } from 'app/modules/truecommand/truecommand-button.component'; @@ -39,13 +39,13 @@ import { TruecommandSignupModalComponent } from './components/truecommand-signup MatButtonModule, MatTooltipModule, MatDialogModule, - TestIdModule, IxInputComponent, IxCheckboxComponent, NgClass, RequiresRolesDirective, FormActionsComponent, UiSearchDirective, + TestDirective, ], providers: [ provideHttpClient(withInterceptorsFromDi()), diff --git a/src/app/pages/account/groups/group-details-row/delete-group-dialog/delete-group-dialog.component.spec.ts b/src/app/pages/account/groups/group-details-row/delete-group-dialog/delete-group-dialog.component.spec.ts index 1412b33f31e..19d602a91c9 100644 --- a/src/app/pages/account/groups/group-details-row/delete-group-dialog/delete-group-dialog.component.spec.ts +++ b/src/app/pages/account/groups/group-details-row/delete-group-dialog/delete-group-dialog.component.spec.ts @@ -9,7 +9,6 @@ import { mockCall, mockWebSocket } from 'app/core/testing/utils/mock-websocket.u import { Group } from 'app/interfaces/group.interface'; import { DialogService } from 'app/modules/dialog/dialog.service'; import { IxCheckboxHarness } from 'app/modules/forms/ix-forms/components/ix-checkbox/ix-checkbox.harness'; -import { AppLoaderModule } from 'app/modules/loader/app-loader.module'; import { SnackbarService } from 'app/modules/snackbar/services/snackbar.service'; import { DeleteGroupDialogComponent, @@ -22,7 +21,6 @@ describe('DeleteGroupDialogComponent', () => { const createComponent = createComponentFactory({ component: DeleteGroupDialogComponent, imports: [ - AppLoaderModule, ReactiveFormsModule, ], providers: [ diff --git a/src/app/pages/account/groups/groups.module.ts b/src/app/pages/account/groups/groups.module.ts index 8e8d6a210c7..f6f4c3f8b76 100644 --- a/src/app/pages/account/groups/groups.module.ts +++ b/src/app/pages/account/groups/groups.module.ts @@ -45,7 +45,7 @@ import { IxTableDetailsRowDirective } from 'app/modules/ix-table/directives/ix-t import { IxTableEmptyDirective } from 'app/modules/ix-table/directives/ix-table-empty.directive'; import { DualListModule } from 'app/modules/lists/dual-list/dual-list.module'; import { PageHeaderModule } from 'app/modules/page-header/page-header.module'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestDirective } from 'app/modules/test-id/test.directive'; import { GroupDetailsRowComponent } from 'app/pages/account/groups/group-details-row/group-details-row.component'; import { GroupFormComponent } from 'app/pages/account/groups/group-form/group-form.component'; import { GroupListComponent } from 'app/pages/account/groups/group-list/group-list.component'; @@ -84,7 +84,6 @@ import { DeleteGroupDialogComponent } from './group-details-row/delete-group-dia TranslateModule, DualListModule, MatSlideToggleModule, - TestIdModule, SearchInputModule, SearchInput1Component, IxFieldsetComponent, @@ -106,6 +105,7 @@ import { DeleteGroupDialogComponent } from './group-details-row/delete-group-dia IxTableComponent, IxTableEmptyDirective, IxTableExpandableRowComponent, + TestDirective, ], declarations: [ GroupListComponent, diff --git a/src/app/pages/account/users/user-details-row/delete-user-dialog/delete-user-dialog.component.spec.ts b/src/app/pages/account/users/user-details-row/delete-user-dialog/delete-user-dialog.component.spec.ts index 7554dfa5cb9..815c9a48e86 100644 --- a/src/app/pages/account/users/user-details-row/delete-user-dialog/delete-user-dialog.component.spec.ts +++ b/src/app/pages/account/users/user-details-row/delete-user-dialog/delete-user-dialog.component.spec.ts @@ -11,7 +11,6 @@ import { Group } from 'app/interfaces/group.interface'; import { User } from 'app/interfaces/user.interface'; import { DialogService } from 'app/modules/dialog/dialog.service'; import { IxCheckboxHarness } from 'app/modules/forms/ix-forms/components/ix-checkbox/ix-checkbox.harness'; -import { AppLoaderModule } from 'app/modules/loader/app-loader.module'; import { SnackbarService } from 'app/modules/snackbar/services/snackbar.service'; import { DeleteUserDialogComponent, @@ -24,7 +23,6 @@ describe('DeleteUserDialogComponent', () => { const createComponent = createComponentFactory({ component: DeleteUserDialogComponent, imports: [ - AppLoaderModule, ReactiveFormsModule, ], providers: [ diff --git a/src/app/pages/account/users/users.module.ts b/src/app/pages/account/users/users.module.ts index ddb1290ce42..590d2d6b8ce 100644 --- a/src/app/pages/account/users/users.module.ts +++ b/src/app/pages/account/users/users.module.ts @@ -52,7 +52,8 @@ import { IxTablePagerComponent } from 'app/modules/ix-table/components/ix-table- import { IxTableDetailsRowDirective } from 'app/modules/ix-table/directives/ix-table-details-row.directive'; import { IxTableEmptyDirective } from 'app/modules/ix-table/directives/ix-table-empty.directive'; import { PageHeaderModule } from 'app/modules/page-header/page-header.module'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestOverrideDirective } from 'app/modules/test-id/test-override/test-override.directive'; +import { TestDirective } from 'app/modules/test-id/test.directive'; import { UserEffects } from 'app/pages/account/users/store/user.effects'; import { userReducer } from 'app/pages/account/users/store/user.reducer'; import { userStateKey } from 'app/pages/account/users/store/user.selectors'; @@ -89,7 +90,6 @@ import { UserDetailsRowComponent } from './user-details-row/user-details-row.com StoreModule.forFeature(userStateKey, userReducer), TranslateModule, TranslateModule, - TestIdModule, SearchInput1Component, IxModalHeaderComponent, IxFieldsetComponent, @@ -115,6 +115,8 @@ import { UserDetailsRowComponent } from './user-details-row/user-details-row.com IxTableDetailsRowDirective, IxTablePagerComponent, IxTableExpandableRowComponent, + TestOverrideDirective, + TestDirective, ], declarations: [ UserListComponent, diff --git a/src/app/pages/api-keys/api-keys.module.ts b/src/app/pages/api-keys/api-keys.module.ts index 29052aeb431..7f7d693804b 100644 --- a/src/app/pages/api-keys/api-keys.module.ts +++ b/src/app/pages/api-keys/api-keys.module.ts @@ -23,7 +23,7 @@ import { IxTableHeadComponent } from 'app/modules/ix-table/components/ix-table-h import { IxTablePagerComponent } from 'app/modules/ix-table/components/ix-table-pager/ix-table-pager.component'; import { IxTableEmptyDirective } from 'app/modules/ix-table/directives/ix-table-empty.directive'; import { PageHeaderModule } from 'app/modules/page-header/page-header.module'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestDirective } from 'app/modules/test-id/test.directive'; import { ApiKeyFormDialogComponent, } from 'app/pages/api-keys/components/api-key-form-dialog/api-key-form-dialog.component'; @@ -47,7 +47,6 @@ import { ApiKeyComponentStore } from './store/api-key.store'; MatTooltipModule, MatDialogModule, TranslateModule, - TestIdModule, routing, SearchInput1Component, IxInputComponent, @@ -62,6 +61,7 @@ import { ApiKeyComponentStore } from './store/api-key.store'; IxTableHeadComponent, IxTableBodyComponent, IxTablePagerComponent, + TestDirective, ], declarations: [ ApiKeyListComponent, diff --git a/src/app/pages/api-keys/components/api-key-list/api-key-list.component.spec.ts b/src/app/pages/api-keys/components/api-key-list/api-key-list.component.spec.ts index 365ce41603b..77768661e3e 100644 --- a/src/app/pages/api-keys/components/api-key-list/api-key-list.component.spec.ts +++ b/src/app/pages/api-keys/components/api-key-list/api-key-list.component.spec.ts @@ -12,7 +12,6 @@ import { DialogService } from 'app/modules/dialog/dialog.service'; import { SearchInput1Component } from 'app/modules/forms/search-input1/search-input1.component'; import { IxIconHarness } from 'app/modules/ix-icon/ix-icon.harness'; import { IxTableHarness } from 'app/modules/ix-table/components/ix-table/ix-table.harness'; -import { AppLoaderModule } from 'app/modules/loader/app-loader.module'; import { PageHeaderModule } from 'app/modules/page-header/page-header.module'; import { ApiKeyFormDialogComponent } from 'app/pages/api-keys/components/api-key-form-dialog/api-key-form-dialog.component'; import { ApiKeyListComponent } from 'app/pages/api-keys/components/api-key-list/api-key-list.component'; @@ -46,7 +45,6 @@ describe('ApiKeyListComponent', () => { const createComponent = createComponentFactory({ component: ApiKeyListComponent, imports: [ - AppLoaderModule, SearchInput1Component, MockModule(PageHeaderModule), ], diff --git a/src/app/pages/apps/apps.module.ts b/src/app/pages/apps/apps.module.ts index 399094f635f..9d8f1da8288 100644 --- a/src/app/pages/apps/apps.module.ts +++ b/src/app/pages/apps/apps.module.ts @@ -51,7 +51,7 @@ import { IxTableHeadComponent } from 'app/modules/ix-table/components/ix-table-h import { IxTablePagerComponent } from 'app/modules/ix-table/components/ix-table-pager/ix-table-pager.component'; import { IxTableEmptyDirective } from 'app/modules/ix-table/directives/ix-table-empty.directive'; import { BulkListItemComponent } from 'app/modules/lists/bulk-list-item/bulk-list-item.component'; -import { AppLoaderModule } from 'app/modules/loader/app-loader.module'; +import { FakeProgressBarComponent } from 'app/modules/loader/components/fake-progress-bar/fake-progress-bar.component'; import { PageHeaderModule } from 'app/modules/page-header/page-header.module'; import { CleanLinkPipe } from 'app/modules/pipes/clean-link/clean-link.pipe'; import { FileSizePipe } from 'app/modules/pipes/file-size/file-size.pipe'; @@ -60,7 +60,7 @@ import { MapValuePipe } from 'app/modules/pipes/map-value/map-value.pipe'; import { NetworkSpeedPipe } from 'app/modules/pipes/network-speed/network-speed.pipe'; import { OrNotAvailablePipe } from 'app/modules/pipes/or-not-available/or-not-available.pipe'; import { TerminalModule } from 'app/modules/terminal/terminal.module'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestDirective } from 'app/modules/test-id/test.directive'; import { AppsRoutingModule } from 'app/pages/apps/apps-routing.module'; import { AppDetailsHeaderComponent, @@ -173,8 +173,6 @@ import { InstalledAppsComponent } from './components/installed-apps/installed-ap NgxSkeletonLoaderModule, IxIconComponent, LazyLoadImageModule, - TestIdModule, - AppLoaderModule, MatExpansionModule, TerminalModule, MatTooltipModule, @@ -223,6 +221,8 @@ import { InstalledAppsComponent } from './components/installed-apps/installed-ap IxTableHeadComponent, IxTableBodyComponent, IxTablePagerComponent, + FakeProgressBarComponent, + TestDirective, ], }) export class AppsModule { } diff --git a/src/app/pages/apps/components/docker-images/docker-image-delete-dialog/docker-image-delete-dialog.component.spec.ts b/src/app/pages/apps/components/docker-images/docker-image-delete-dialog/docker-image-delete-dialog.component.spec.ts index b4a40f67acd..d14ab0216ce 100644 --- a/src/app/pages/apps/components/docker-images/docker-image-delete-dialog/docker-image-delete-dialog.component.spec.ts +++ b/src/app/pages/apps/components/docker-images/docker-image-delete-dialog/docker-image-delete-dialog.component.spec.ts @@ -14,7 +14,6 @@ import { CoreBulkQuery, CoreBulkResponse } from 'app/interfaces/core-bulk.interf import { DialogService } from 'app/modules/dialog/dialog.service'; import { IxFormHarness } from 'app/modules/forms/ix-forms/testing/ix-form.harness'; import { BulkListItemComponent } from 'app/modules/lists/bulk-list-item/bulk-list-item.component'; -import { AppLoaderModule } from 'app/modules/loader/app-loader.module'; import { AppLoaderService } from 'app/modules/loader/app-loader.service'; import { DockerImageDeleteDialogComponent } from 'app/pages/apps/components/docker-images/docker-image-delete-dialog/docker-image-delete-dialog.component'; import { fakeDockerImagesDataSource } from 'app/pages/apps/components/docker-images/test/fake-docker-images'; @@ -43,7 +42,6 @@ describe('DockerImageDeleteDialogComponent', () => { const createComponent = createComponentFactory({ component: DockerImageDeleteDialogComponent, imports: [ - AppLoaderModule, ReactiveFormsModule, ], declarations: [ diff --git a/src/app/pages/apps/components/installed-apps/app-bulk-upgrade/app-bulk-upgrade.component.spec.ts b/src/app/pages/apps/components/installed-apps/app-bulk-upgrade/app-bulk-upgrade.component.spec.ts index 78d125b560c..b7fa61cf9f5 100644 --- a/src/app/pages/apps/components/installed-apps/app-bulk-upgrade/app-bulk-upgrade.component.spec.ts +++ b/src/app/pages/apps/components/installed-apps/app-bulk-upgrade/app-bulk-upgrade.component.spec.ts @@ -16,7 +16,6 @@ import { AppUpgradeSummary } from 'app/interfaces/application.interface'; import { CoreBulkQuery } from 'app/interfaces/core-bulk.interface'; import { DialogService } from 'app/modules/dialog/dialog.service'; import { BulkListItemComponent } from 'app/modules/lists/bulk-list-item/bulk-list-item.component'; -import { AppLoaderModule } from 'app/modules/loader/app-loader.module'; import { SnackbarService } from 'app/modules/snackbar/services/snackbar.service'; import { AppBulkUpgradeComponent } from 'app/pages/apps/components/installed-apps/app-bulk-upgrade/app-bulk-upgrade.component'; import { WebSocketService } from 'app/services/ws.service'; @@ -78,7 +77,6 @@ describe('AppBulkUpgradeComponent', () => { const createComponent = createComponentFactory({ component: AppBulkUpgradeComponent, imports: [ - AppLoaderModule, ReactiveFormsModule, ImgFallbackModule, LetDirective, diff --git a/src/app/pages/apps/components/shell-details-dialog/shell-details-dialog.component.spec.ts b/src/app/pages/apps/components/shell-details-dialog/shell-details-dialog.component.spec.ts index b9ea2ab7bd7..6dd8582be3d 100644 --- a/src/app/pages/apps/components/shell-details-dialog/shell-details-dialog.component.spec.ts +++ b/src/app/pages/apps/components/shell-details-dialog/shell-details-dialog.component.spec.ts @@ -7,7 +7,6 @@ import { createComponentFactory, mockProvider, Spectator } from '@ngneat/spectat import { MockWebSocketService } from 'app/core/testing/classes/mock-websocket.service'; import { mockCall, mockWebSocket } from 'app/core/testing/utils/mock-websocket.utils'; import { IxFormHarness } from 'app/modules/forms/ix-forms/testing/ix-form.harness'; -import { AppLoaderModule } from 'app/modules/loader/app-loader.module'; import { ShellDetailsDialogComponent } from 'app/pages/apps/components/shell-details-dialog/shell-details-dialog.component'; import { ShellDetailsType } from 'app/pages/apps/enum/shell-details-type.enum'; @@ -20,7 +19,6 @@ describe.skip('ShellDetailsDialogComponent', () => { const createComponent = createComponentFactory({ component: ShellDetailsDialogComponent, imports: [ - AppLoaderModule, ReactiveFormsModule, ], providers: [ diff --git a/src/app/pages/audit/audit.module.ts b/src/app/pages/audit/audit.module.ts index 8995feb1fef..010ec923ac7 100644 --- a/src/app/pages/audit/audit.module.ts +++ b/src/app/pages/audit/audit.module.ts @@ -18,9 +18,9 @@ import { IxTableHeadComponent } from 'app/modules/ix-table/components/ix-table-h import { IxTablePagerComponent } from 'app/modules/ix-table/components/ix-table-pager/ix-table-pager.component'; import { IxTableCellDirective } from 'app/modules/ix-table/directives/ix-table-cell.directive'; import { IxTableEmptyDirective } from 'app/modules/ix-table/directives/ix-table-empty.directive'; -import { AppLoaderModule } from 'app/modules/loader/app-loader.module'; +import { FakeProgressBarComponent } from 'app/modules/loader/components/fake-progress-bar/fake-progress-bar.component'; import { PageHeaderModule } from 'app/modules/page-header/page-header.module'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestDirective } from 'app/modules/test-id/test.directive'; import { AuditComponent } from 'app/pages/audit/components/audit/audit.component'; import { routing } from './audit.routing'; import { EventDataDetailsCardComponent } from './components/event-data-details-card/event-data-details-card.component'; @@ -30,13 +30,11 @@ import { MetadataDetailsCardComponent } from './components/metadata-details-card @NgModule({ imports: [ MatButtonModule, - TestIdModule, TranslateModule, MatCardModule, IxIconComponent, ReactiveFormsModule, MatSelectModule, - AppLoaderModule, SearchInputModule, MatTooltipModule, routing, @@ -53,6 +51,8 @@ import { MetadataDetailsCardComponent } from './components/metadata-details-card IxTableCellDirective, IxTablePagerComponent, IxTableHeadComponent, + FakeProgressBarComponent, + TestDirective, ], exports: [], declarations: [ diff --git a/src/app/pages/credentials/backup-credentials/ssh-connection-form/ssh-connection-form.component.spec.ts b/src/app/pages/credentials/backup-credentials/ssh-connection-form/ssh-connection-form.component.spec.ts index 6f878f5ea63..d3f80ba486e 100644 --- a/src/app/pages/credentials/backup-credentials/ssh-connection-form/ssh-connection-form.component.spec.ts +++ b/src/app/pages/credentials/backup-credentials/ssh-connection-form/ssh-connection-form.component.spec.ts @@ -14,7 +14,6 @@ import { KeychainSshCredentials } from 'app/interfaces/keychain-credential.inter import { DialogService } from 'app/modules/dialog/dialog.service'; import { ChainedRef } from 'app/modules/forms/ix-forms/components/ix-slide-in/chained-component-ref'; import { IxFormHarness } from 'app/modules/forms/ix-forms/testing/ix-form.harness'; -import { AppLoaderModule } from 'app/modules/loader/app-loader.module'; import { KeychainCredentialService } from 'app/services/keychain-credential.service'; import { WebSocketService } from 'app/services/ws.service'; import { SshConnectionFormComponent } from './ssh-connection-form.component'; @@ -46,7 +45,6 @@ describe('SshConnectionFormComponent', () => { component: SshConnectionFormComponent, imports: [ ReactiveFormsModule, - AppLoaderModule, ], providers: [ mockWebSocket([ diff --git a/src/app/pages/credentials/certificates-dash/sign-csr-dialog/sign-csr-dialog.component.spec.ts b/src/app/pages/credentials/certificates-dash/sign-csr-dialog/sign-csr-dialog.component.spec.ts index 6ba4734f784..f412639c78b 100644 --- a/src/app/pages/credentials/certificates-dash/sign-csr-dialog/sign-csr-dialog.component.spec.ts +++ b/src/app/pages/credentials/certificates-dash/sign-csr-dialog/sign-csr-dialog.component.spec.ts @@ -10,7 +10,6 @@ import { mockCall, mockWebSocket } from 'app/core/testing/utils/mock-websocket.u import { DialogService } from 'app/modules/dialog/dialog.service'; import { IxSelectHarness } from 'app/modules/forms/ix-forms/components/ix-select/ix-select.harness'; import { IxFormHarness } from 'app/modules/forms/ix-forms/testing/ix-form.harness'; -import { AppLoaderModule } from 'app/modules/loader/app-loader.module'; import { SystemGeneralService } from 'app/services/system-general.service'; import { WebSocketService } from 'app/services/ws.service'; import { SignCsrDialogComponent } from './sign-csr-dialog.component'; @@ -22,7 +21,6 @@ describe('SignCsrDialogComponent', () => { component: SignCsrDialogComponent, imports: [ ReactiveFormsModule, - AppLoaderModule, ], providers: [ mockWebSocket([ diff --git a/src/app/pages/credentials/credentials.module.ts b/src/app/pages/credentials/credentials.module.ts index a7b7c793657..7ad2f404f6c 100644 --- a/src/app/pages/credentials/credentials.module.ts +++ b/src/app/pages/credentials/credentials.module.ts @@ -48,7 +48,7 @@ import { IxTableCellDirective } from 'app/modules/ix-table/directives/ix-table-c import { IxTableEmptyDirective } from 'app/modules/ix-table/directives/ix-table-empty.directive'; import { FormatDateTimePipe } from 'app/modules/pipes/format-date-time/format-datetime.pipe'; import { SummaryComponent } from 'app/modules/summary/summary.component'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestDirective } from 'app/modules/test-id/test.directive'; import { CloudCredentialsFormComponent, } from 'app/pages/credentials/backup-credentials/cloud-credentials-form/cloud-credentials-form.component'; @@ -188,7 +188,6 @@ import { CertificateSubjectComponent } from './certificates-dash/forms/common-st ReactiveFormsModule, RouterModule, routing, - TestIdModule, TranslateModule, OauthButtonModule, CloudSyncProviderDescriptionComponent, @@ -217,6 +216,7 @@ import { CertificateSubjectComponent } from './certificates-dash/forms/common-st IxTableBodyComponent, IxTablePagerShowMoreComponent, IxTableCellDirective, + TestDirective, ], }) export class CredentialsModule { } diff --git a/src/app/pages/dashboard/components/widget-group-form/widget-group-form.component.spec.ts b/src/app/pages/dashboard/components/widget-group-form/widget-group-form.component.spec.ts index 3a45db94751..dd6e60ff1c4 100644 --- a/src/app/pages/dashboard/components/widget-group-form/widget-group-form.component.spec.ts +++ b/src/app/pages/dashboard/components/widget-group-form/widget-group-form.component.spec.ts @@ -11,7 +11,6 @@ import { ChainedRef } from 'app/modules/forms/ix-forms/components/ix-slide-in/ch import { IxSlideInRef } from 'app/modules/forms/ix-forms/components/ix-slide-in/ix-slide-in-ref'; import { FormErrorHandlerService } from 'app/modules/forms/ix-forms/services/form-error-handler.service'; import { SnackbarService } from 'app/modules/snackbar/services/snackbar.service'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; import { WidgetEditorGroupComponent } from 'app/pages/dashboard/components/widget-group-form/widget-editor-group/widget-editor-group.component'; import { WidgetGroupFormComponent } from 'app/pages/dashboard/components/widget-group-form/widget-group-form.component'; import { WidgetGroupSlotFormComponent } from 'app/pages/dashboard/components/widget-group-form/widget-group-slot-form/widget-group-slot-form.component'; diff --git a/src/app/pages/dashboard/dashboard.module.ts b/src/app/pages/dashboard/dashboard.module.ts index b5e6b28ac43..6e55a7b9cdb 100644 --- a/src/app/pages/dashboard/dashboard.module.ts +++ b/src/app/pages/dashboard/dashboard.module.ts @@ -35,13 +35,15 @@ import { InterfaceStatusIconComponent } from 'app/modules/interface-status-icon/ import { IxDropGridModule } from 'app/modules/ix-drop-grid/ix-drop-grid.module'; import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; import { CopyrightLineComponent } from 'app/modules/layout/copyright-line/copyright-line.component'; -import { AppLoaderModule } from 'app/modules/loader/app-loader.module'; +import { + WithLoadingStateDirective, +} from 'app/modules/loader/directives/with-loading-state/with-loading-state.directive'; import { PageHeaderModule } from 'app/modules/page-header/page-header.module'; import { FileSizePipe } from 'app/modules/pipes/file-size/file-size.pipe'; import { FormatDateTimePipe } from 'app/modules/pipes/format-date-time/format-datetime.pipe'; import { MapValuePipe } from 'app/modules/pipes/map-value/map-value.pipe'; import { NetworkSpeedPipe } from 'app/modules/pipes/network-speed/network-speed.pipe'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestDirective } from 'app/modules/test-id/test.directive'; import { AppCardLogoComponent } from 'app/pages/apps/components/app-card-logo/app-card-logo.component'; import { AppStateCellComponent } from 'app/pages/apps/components/installed-apps/app-state-cell/app-state-cell.component'; import { AppUpdateCellComponent } from 'app/pages/apps/components/installed-apps/app-update-cell/app-update-cell.component'; @@ -119,9 +121,7 @@ import { PoolUsageGaugeComponent } from './widgets/storage/widget-pool/common/po imports: [ ReactiveFormsModule, TranslateModule, - AppLoaderModule, NgComponentOutlet, - TestIdModule, PageHeaderModule, routing, MatCard, @@ -175,6 +175,8 @@ import { PoolUsageGaugeComponent } from './widgets/storage/widget-pool/common/po AppStateCellComponent, AppUpdateCellComponent, AppVersionPipe, + TestDirective, + WithLoadingStateDirective, ], }) export class DashboardModule { diff --git a/src/app/pages/data-protection/cloud-backup/cloud-backup-card/cloud-backup-card.component.spec.ts b/src/app/pages/data-protection/cloud-backup/cloud-backup-card/cloud-backup-card.component.spec.ts index 522a089504f..7b0b559bc15 100644 --- a/src/app/pages/data-protection/cloud-backup/cloud-backup-card/cloud-backup-card.component.spec.ts +++ b/src/app/pages/data-protection/cloud-backup/cloud-backup-card/cloud-backup-card.component.spec.ts @@ -15,7 +15,6 @@ import { IxSlideInRef } from 'app/modules/forms/ix-forms/components/ix-slide-in/ import { IxIconHarness } from 'app/modules/ix-icon/ix-icon.harness'; import { IxTableHarness } from 'app/modules/ix-table/components/ix-table/ix-table.harness'; import { selectJobs } from 'app/modules/jobs/store/job.selectors'; -import { AppLoaderModule } from 'app/modules/loader/app-loader.module'; import { CloudBackupCardComponent, } from 'app/pages/data-protection/cloud-backup/cloud-backup-card/cloud-backup-card.component'; @@ -50,7 +49,6 @@ describe('CloudBackupCardComponent', () => { const createComponent = createComponentFactory({ component: CloudBackupCardComponent, imports: [ - AppLoaderModule, ], providers: [ mockAuth(), diff --git a/src/app/pages/data-protection/cloud-backup/cloud-backup-list/cloud-backup-list.component.spec.ts b/src/app/pages/data-protection/cloud-backup/cloud-backup-list/cloud-backup-list.component.spec.ts index 08469925924..bd8d53cae0e 100644 --- a/src/app/pages/data-protection/cloud-backup/cloud-backup-list/cloud-backup-list.component.spec.ts +++ b/src/app/pages/data-protection/cloud-backup/cloud-backup-list/cloud-backup-list.component.spec.ts @@ -18,7 +18,6 @@ import { AsyncDataProvider } from 'app/modules/ix-table/classes/async-data-provi import { IxTableHarness } from 'app/modules/ix-table/components/ix-table/ix-table.harness'; import { SortDirection } from 'app/modules/ix-table/enums/sort-direction.enum'; import { selectJobs } from 'app/modules/jobs/store/job.selectors'; -import { AppLoaderModule } from 'app/modules/loader/app-loader.module'; import { PageHeaderModule } from 'app/modules/page-header/page-header.module'; import { CloudBackupDetailsComponent } from 'app/pages/data-protection/cloud-backup/cloud-backup-details/cloud-backup-details.component'; import { @@ -54,7 +53,6 @@ describe('CloudBackupListComponent', () => { const createComponent = createComponentFactory({ component: CloudBackupListComponent, imports: [ - AppLoaderModule, MockModule(PageHeaderModule), SearchInput1Component, ], diff --git a/src/app/pages/data-protection/cloudsync/cloudsync-list/cloudsync-list.component.spec.ts b/src/app/pages/data-protection/cloudsync/cloudsync-list/cloudsync-list.component.spec.ts index 3aa295b9a00..49566ba06b0 100644 --- a/src/app/pages/data-protection/cloudsync/cloudsync-list/cloudsync-list.component.spec.ts +++ b/src/app/pages/data-protection/cloudsync/cloudsync-list/cloudsync-list.component.spec.ts @@ -23,7 +23,6 @@ import { } from 'app/modules/ix-table/components/ix-table-details-row/ix-table-details-row.component'; import { IxTableDetailsRowDirective } from 'app/modules/ix-table/directives/ix-table-details-row.directive'; import { selectJob } from 'app/modules/jobs/store/job.selectors'; -import { AppLoaderModule } from 'app/modules/loader/app-loader.module'; import { PageHeaderModule } from 'app/modules/page-header/page-header.module'; import { SnackbarService } from 'app/modules/snackbar/services/snackbar.service'; import { CloudSyncFormComponent } from 'app/pages/data-protection/cloudsync/cloudsync-form/cloudsync-form.component'; @@ -92,7 +91,6 @@ describe('CloudSyncListComponent', () => { const createComponent = createComponentFactory({ component: CloudSyncListComponent, imports: [ - AppLoaderModule, MockModule(PageHeaderModule), SearchInput1Component, IxTableColumnsSelectorComponent, diff --git a/src/app/pages/data-protection/cloudsync/cloudsync-restore-dialog/cloudsync-restore-dialog.component.spec.ts b/src/app/pages/data-protection/cloudsync/cloudsync-restore-dialog/cloudsync-restore-dialog.component.spec.ts index c568de4e0b4..16e06f40ead 100644 --- a/src/app/pages/data-protection/cloudsync/cloudsync-restore-dialog/cloudsync-restore-dialog.component.spec.ts +++ b/src/app/pages/data-protection/cloudsync/cloudsync-restore-dialog/cloudsync-restore-dialog.component.spec.ts @@ -9,7 +9,6 @@ import { mockCall, mockWebSocket } from 'app/core/testing/utils/mock-websocket.u import { TransferMode } from 'app/enums/transfer-mode.enum'; import { DialogService } from 'app/modules/dialog/dialog.service'; import { IxFormHarness } from 'app/modules/forms/ix-forms/testing/ix-form.harness'; -import { AppLoaderModule } from 'app/modules/loader/app-loader.module'; import { TransferModeExplanationComponent, } from 'app/pages/data-protection/cloudsync/transfer-mode-explanation/transfer-mode-explanation.component'; @@ -24,7 +23,6 @@ describe('CloudSyncRestoreDialogComponent', () => { component: CloudSyncRestoreDialogComponent, imports: [ ReactiveFormsModule, - AppLoaderModule, ], declarations: [ TransferModeExplanationComponent, diff --git a/src/app/pages/data-protection/cloudsync/cloudsync-task-card/cloudsync-task-card.component.spec.ts b/src/app/pages/data-protection/cloudsync/cloudsync-task-card/cloudsync-task-card.component.spec.ts index 4c401b72b9b..c19b9db8d23 100644 --- a/src/app/pages/data-protection/cloudsync/cloudsync-task-card/cloudsync-task-card.component.spec.ts +++ b/src/app/pages/data-protection/cloudsync/cloudsync-task-card/cloudsync-task-card.component.spec.ts @@ -20,7 +20,6 @@ import { IxSlideInRef } from 'app/modules/forms/ix-forms/components/ix-slide-in/ import { IxIconHarness } from 'app/modules/ix-icon/ix-icon.harness'; import { IxTableHarness } from 'app/modules/ix-table/components/ix-table/ix-table.harness'; import { selectJobs } from 'app/modules/jobs/store/job.selectors'; -import { AppLoaderModule } from 'app/modules/loader/app-loader.module'; import { SnackbarService } from 'app/modules/snackbar/services/snackbar.service'; import { CloudSyncFormComponent } from 'app/pages/data-protection/cloudsync/cloudsync-form/cloudsync-form.component'; import { @@ -96,7 +95,6 @@ describe('CloudSyncTaskCardComponent', () => { const createComponent = createComponentFactory({ component: CloudSyncTaskCardComponent, imports: [ - AppLoaderModule, ], providers: [ mockAuth(), diff --git a/src/app/pages/data-protection/data-protection.module.ts b/src/app/pages/data-protection/data-protection.module.ts index ad75101fe29..a6fcee2465b 100755 --- a/src/app/pages/data-protection/data-protection.module.ts +++ b/src/app/pages/data-protection/data-protection.module.ts @@ -54,10 +54,9 @@ import { IxTablePagerComponent } from 'app/modules/ix-table/components/ix-table- import { IxTableCellDirective } from 'app/modules/ix-table/directives/ix-table-cell.directive'; import { IxTableDetailsRowDirective } from 'app/modules/ix-table/directives/ix-table-details-row.directive'; import { IxTableEmptyDirective } from 'app/modules/ix-table/directives/ix-table-empty.directive'; -import { JobsModule } from 'app/modules/jobs/jobs.module'; import { PageHeaderModule } from 'app/modules/page-header/page-header.module'; import { SchedulerModule } from 'app/modules/scheduler/scheduler.module'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestDirective } from 'app/modules/test-id/test.directive'; import { CloudBackupRestoreFromSnapshotFormComponent } from 'app/pages/data-protection/cloud-backup/cloud-backup-details/cloud-backup-restore-form-snapshot-form/cloud-backup-restore-from-snapshot-form.component'; import { CloudBackupFormComponent, @@ -145,9 +144,7 @@ import { SmartTaskListComponent } from './smart-task/smart-task-list/smart-task- MatButtonModule, MatDialogModule, IxIconComponent, - TestIdModule, MatStepperModule, - JobsModule, MatToolbarModule, MatTooltipModule, MatDividerModule, @@ -182,6 +179,7 @@ import { SmartTaskListComponent } from './smart-task/smart-task-list/smart-task- IxTableDetailsRowDirective, IxTableColumnsSelectorComponent, IxTableCellDirective, + TestDirective, ], declarations: [ SnapshotTaskListComponent, diff --git a/src/app/pages/data-protection/replication/replication-list/replication-list.component.spec.ts b/src/app/pages/data-protection/replication/replication-list/replication-list.component.spec.ts index b909679da4c..0c3a2af143d 100644 --- a/src/app/pages/data-protection/replication/replication-list/replication-list.component.spec.ts +++ b/src/app/pages/data-protection/replication/replication-list/replication-list.component.spec.ts @@ -32,7 +32,6 @@ import { } from 'app/modules/ix-table/components/ix-table-details-row/ix-table-details-row.component'; import { IxTableDetailsRowDirective } from 'app/modules/ix-table/directives/ix-table-details-row.directive'; import { selectJobs } from 'app/modules/jobs/store/job.selectors'; -import { AppLoaderModule } from 'app/modules/loader/app-loader.module'; import { PageHeaderModule } from 'app/modules/page-header/page-header.module'; import { ReplicationFormComponent } from 'app/pages/data-protection/replication/replication-form/replication-form.component'; import { ReplicationListComponent } from 'app/pages/data-protection/replication/replication-list/replication-list.component'; @@ -118,7 +117,6 @@ describe('ReplicationListComponent', () => { const createComponent = createComponentFactory({ component: ReplicationListComponent, imports: [ - AppLoaderModule, MockModule(PageHeaderModule), SearchInput1Component, IxTableDetailsRowDirective, diff --git a/src/app/pages/data-protection/replication/replication-restore-dialog/replication-restore-dialog.component.spec.ts b/src/app/pages/data-protection/replication/replication-restore-dialog/replication-restore-dialog.component.spec.ts index 3eaba8f36d6..c61295f7173 100644 --- a/src/app/pages/data-protection/replication/replication-restore-dialog/replication-restore-dialog.component.spec.ts +++ b/src/app/pages/data-protection/replication/replication-restore-dialog/replication-restore-dialog.component.spec.ts @@ -8,7 +8,6 @@ import { mockAuth } from 'app/core/testing/utils/mock-auth.utils'; import { mockCall, mockWebSocket } from 'app/core/testing/utils/mock-websocket.utils'; import { DialogService } from 'app/modules/dialog/dialog.service'; import { IxFormHarness } from 'app/modules/forms/ix-forms/testing/ix-form.harness'; -import { AppLoaderModule } from 'app/modules/loader/app-loader.module'; import { ReplicationRestoreDialogComponent, } from 'app/pages/data-protection/replication/replication-restore-dialog/replication-restore-dialog.component'; @@ -22,7 +21,6 @@ describe('ReplicationRestoreDialogComponent', () => { component: ReplicationRestoreDialogComponent, imports: [ ReactiveFormsModule, - AppLoaderModule, ], providers: [ mockAuth(), diff --git a/src/app/pages/data-protection/replication/replication-task-card/replication-task-card.component.spec.ts b/src/app/pages/data-protection/replication/replication-task-card/replication-task-card.component.spec.ts index 5d312262e17..6f3ad04ee39 100644 --- a/src/app/pages/data-protection/replication/replication-task-card/replication-task-card.component.spec.ts +++ b/src/app/pages/data-protection/replication/replication-task-card/replication-task-card.component.spec.ts @@ -14,7 +14,6 @@ import { DialogService } from 'app/modules/dialog/dialog.service'; import { IxSlideInRef } from 'app/modules/forms/ix-forms/components/ix-slide-in/ix-slide-in-ref'; import { IxIconHarness } from 'app/modules/ix-icon/ix-icon.harness'; import { IxTableHarness } from 'app/modules/ix-table/components/ix-table/ix-table.harness'; -import { AppLoaderModule } from 'app/modules/loader/app-loader.module'; import { ReplicationFormComponent } from 'app/pages/data-protection/replication/replication-form/replication-form.component'; import { ReplicationRestoreDialogComponent } from 'app/pages/data-protection/replication/replication-restore-dialog/replication-restore-dialog.component'; import { ReplicationTaskCardComponent } from 'app/pages/data-protection/replication/replication-task-card/replication-task-card.component'; @@ -59,7 +58,6 @@ describe('ReplicationTaskCardComponent', () => { const createComponent = createComponentFactory({ component: ReplicationTaskCardComponent, imports: [ - AppLoaderModule, ], providers: [ mockAuth(), diff --git a/src/app/pages/data-protection/rsync-task/rsync-task-card/rsync-task-card.component.spec.ts b/src/app/pages/data-protection/rsync-task/rsync-task-card/rsync-task-card.component.spec.ts index c7aba793cf5..0a19e66e4de 100644 --- a/src/app/pages/data-protection/rsync-task/rsync-task-card/rsync-task-card.component.spec.ts +++ b/src/app/pages/data-protection/rsync-task/rsync-task-card/rsync-task-card.component.spec.ts @@ -16,7 +16,6 @@ import { IxSlideInRef } from 'app/modules/forms/ix-forms/components/ix-slide-in/ import { IxIconHarness } from 'app/modules/ix-icon/ix-icon.harness'; import { IxTableHarness } from 'app/modules/ix-table/components/ix-table/ix-table.harness'; import { selectJobs } from 'app/modules/jobs/store/job.selectors'; -import { AppLoaderModule } from 'app/modules/loader/app-loader.module'; import { RsyncTaskCardComponent } from 'app/pages/data-protection/rsync-task/rsync-task-card/rsync-task-card.component'; import { RsyncTaskFormComponent } from 'app/pages/data-protection/rsync-task/rsync-task-form/rsync-task-form.component'; import { IxChainedSlideInService } from 'app/services/ix-chained-slide-in.service'; @@ -71,7 +70,6 @@ describe('RsyncTaskCardComponent', () => { const createComponent = createComponentFactory({ component: RsyncTaskCardComponent, imports: [ - AppLoaderModule, ], providers: [ mockAuth(), diff --git a/src/app/pages/data-protection/scrub-task/scrub-task-card/scrub-task-card.component.spec.ts b/src/app/pages/data-protection/scrub-task/scrub-task-card/scrub-task-card.component.spec.ts index 47dbd5aa008..3ebb45f4e59 100644 --- a/src/app/pages/data-protection/scrub-task/scrub-task-card/scrub-task-card.component.spec.ts +++ b/src/app/pages/data-protection/scrub-task/scrub-task-card/scrub-task-card.component.spec.ts @@ -14,7 +14,6 @@ import { DialogService } from 'app/modules/dialog/dialog.service'; import { IxSlideInRef } from 'app/modules/forms/ix-forms/components/ix-slide-in/ix-slide-in-ref'; import { IxIconHarness } from 'app/modules/ix-icon/ix-icon.harness'; import { IxTableHarness } from 'app/modules/ix-table/components/ix-table/ix-table.harness'; -import { AppLoaderModule } from 'app/modules/loader/app-loader.module'; import { ScrubTaskCardComponent } from 'app/pages/data-protection/scrub-task/scrub-task-card/scrub-task-card.component'; import { ScrubTaskFormComponent } from 'app/pages/data-protection/scrub-task/scrub-task-form/scrub-task-form.component'; import { IxSlideInService } from 'app/services/ix-slide-in.service'; @@ -49,7 +48,6 @@ describe('ScrubTaskCardComponent', () => { const createComponent = createComponentFactory({ component: ScrubTaskCardComponent, imports: [ - AppLoaderModule, ], providers: [ mockAuth(), diff --git a/src/app/pages/data-protection/smart-task/smart-task-card/smart-task-card.component.spec.ts b/src/app/pages/data-protection/smart-task/smart-task-card/smart-task-card.component.spec.ts index 9da5cde9cfe..3a671ce8e7f 100644 --- a/src/app/pages/data-protection/smart-task/smart-task-card/smart-task-card.component.spec.ts +++ b/src/app/pages/data-protection/smart-task/smart-task-card/smart-task-card.component.spec.ts @@ -15,7 +15,6 @@ import { DialogService } from 'app/modules/dialog/dialog.service'; import { IxSlideInRef } from 'app/modules/forms/ix-forms/components/ix-slide-in/ix-slide-in-ref'; import { IxIconHarness } from 'app/modules/ix-icon/ix-icon.harness'; import { IxTableHarness } from 'app/modules/ix-table/components/ix-table/ix-table.harness'; -import { AppLoaderModule } from 'app/modules/loader/app-loader.module'; import { SmartTaskCardComponent } from 'app/pages/data-protection/smart-task/smart-task-card/smart-task-card.component'; import { SmartTaskFormComponent } from 'app/pages/data-protection/smart-task/smart-task-form/smart-task-form.component'; import { IxSlideInService } from 'app/services/ix-slide-in.service'; @@ -75,7 +74,6 @@ describe('SmartTaskCardComponent', () => { const createComponent = createComponentFactory({ component: SmartTaskCardComponent, imports: [ - AppLoaderModule, ], providers: [ mockAuth(), diff --git a/src/app/pages/data-protection/smart-task/smart-task-list/smart-task-list.component.spec.ts b/src/app/pages/data-protection/smart-task/smart-task-list/smart-task-list.component.spec.ts index 0938120e154..d6d42dbc5a9 100644 --- a/src/app/pages/data-protection/smart-task/smart-task-list/smart-task-list.component.spec.ts +++ b/src/app/pages/data-protection/smart-task/smart-task-list/smart-task-list.component.spec.ts @@ -16,7 +16,6 @@ import { IxSlideInRef } from 'app/modules/forms/ix-forms/components/ix-slide-in/ import { SearchInput1Component } from 'app/modules/forms/search-input1/search-input1.component'; import { IxIconHarness } from 'app/modules/ix-icon/ix-icon.harness'; import { IxTableHarness } from 'app/modules/ix-table/components/ix-table/ix-table.harness'; -import { AppLoaderModule } from 'app/modules/loader/app-loader.module'; import { PageHeaderModule } from 'app/modules/page-header/page-header.module'; import { SmartTaskCardComponent } from 'app/pages/data-protection/smart-task/smart-task-card/smart-task-card.component'; import { SmartTaskFormComponent } from 'app/pages/data-protection/smart-task/smart-task-form/smart-task-form.component'; @@ -77,7 +76,6 @@ describe('SmartTaskCardComponent', () => { const createComponent = createComponentFactory({ component: SmartTaskCardComponent, imports: [ - AppLoaderModule, MockModule(PageHeaderModule), SearchInput1Component, ], diff --git a/src/app/pages/data-protection/snapshot-task/snapshot-task-card/snapshot-task-card.component.spec.ts b/src/app/pages/data-protection/snapshot-task/snapshot-task-card/snapshot-task-card.component.spec.ts index 16ccbc74256..8949ac1cd1f 100644 --- a/src/app/pages/data-protection/snapshot-task/snapshot-task-card/snapshot-task-card.component.spec.ts +++ b/src/app/pages/data-protection/snapshot-task/snapshot-task-card/snapshot-task-card.component.spec.ts @@ -14,7 +14,6 @@ import { DialogService } from 'app/modules/dialog/dialog.service'; import { IxSlideInRef } from 'app/modules/forms/ix-forms/components/ix-slide-in/ix-slide-in-ref'; import { IxIconHarness } from 'app/modules/ix-icon/ix-icon.harness'; import { IxTableHarness } from 'app/modules/ix-table/components/ix-table/ix-table.harness'; -import { AppLoaderModule } from 'app/modules/loader/app-loader.module'; import { SnapshotTaskCardComponent } from 'app/pages/data-protection/snapshot-task/snapshot-task-card/snapshot-task-card.component'; import { SnapshotTaskFormComponent } from 'app/pages/data-protection/snapshot-task/snapshot-task-form/snapshot-task-form.component'; import { IxSlideInService } from 'app/services/ix-slide-in.service'; @@ -65,7 +64,6 @@ describe('SnapshotTaskCardComponent', () => { const createComponent = createComponentFactory({ component: SnapshotTaskCardComponent, imports: [ - AppLoaderModule, ], providers: [ mockAuth(), diff --git a/src/app/pages/data-protection/snapshot-task/snapshot-task-list/snapshot-task-list.component.spec.ts b/src/app/pages/data-protection/snapshot-task/snapshot-task-list/snapshot-task-list.component.spec.ts index 146ef44fa9b..45f72e485dc 100644 --- a/src/app/pages/data-protection/snapshot-task/snapshot-task-list/snapshot-task-list.component.spec.ts +++ b/src/app/pages/data-protection/snapshot-task/snapshot-task-list/snapshot-task-list.component.spec.ts @@ -19,7 +19,6 @@ import { IxTableDetailsRowComponent, } from 'app/modules/ix-table/components/ix-table-details-row/ix-table-details-row.component'; import { IxTableDetailsRowDirective } from 'app/modules/ix-table/directives/ix-table-details-row.directive'; -import { AppLoaderModule } from 'app/modules/loader/app-loader.module'; import { PageHeaderModule } from 'app/modules/page-header/page-header.module'; import { SnapshotTaskFormComponent } from 'app/pages/data-protection/snapshot-task/snapshot-task-form/snapshot-task-form.component'; import { SnapshotTaskListComponent } from 'app/pages/data-protection/snapshot-task/snapshot-task-list/snapshot-task-list.component'; @@ -63,7 +62,6 @@ describe('SnapshotTaskListComponent', () => { const createComponent = createComponentFactory({ component: SnapshotTaskListComponent, imports: [ - AppLoaderModule, MockModule(PageHeaderModule), SearchInput1Component, IxTableColumnsSelectorComponent, diff --git a/src/app/pages/datasets/components/delete-dataset-dialog/delete-dataset-dialog.component.spec.ts b/src/app/pages/datasets/components/delete-dataset-dialog/delete-dataset-dialog.component.spec.ts index f76a48613d4..49b9cec56d6 100644 --- a/src/app/pages/datasets/components/delete-dataset-dialog/delete-dataset-dialog.component.spec.ts +++ b/src/app/pages/datasets/components/delete-dataset-dialog/delete-dataset-dialog.component.spec.ts @@ -14,7 +14,6 @@ import { VolumesListDataset } from 'app/interfaces/volumes-list-pool.interface'; import { DialogService } from 'app/modules/dialog/dialog.service'; import { IxCheckboxHarness } from 'app/modules/forms/ix-forms/components/ix-checkbox/ix-checkbox.harness'; import { IxInputHarness } from 'app/modules/forms/ix-forms/components/ix-input/ix-input.harness'; -import { AppLoaderModule } from 'app/modules/loader/app-loader.module'; import { WebSocketService } from 'app/services/ws.service'; import { DeleteDatasetDialogComponent } from './delete-dataset-dialog.component'; @@ -25,7 +24,6 @@ describe('DeleteDatasetDialogComponent', () => { const createComponent = createComponentFactory({ component: DeleteDatasetDialogComponent, imports: [ - AppLoaderModule, ReactiveFormsModule, ], providers: [ diff --git a/src/app/pages/datasets/datasets.module.ts b/src/app/pages/datasets/datasets.module.ts index 4e1bdac72fe..a199c91abd9 100644 --- a/src/app/pages/datasets/datasets.module.ts +++ b/src/app/pages/datasets/datasets.module.ts @@ -38,11 +38,11 @@ import { IxTableHeadComponent } from 'app/modules/ix-table/components/ix-table-h import { IxTablePagerComponent } from 'app/modules/ix-table/components/ix-table-pager/ix-table-pager.component'; import { IxTableEmptyDirective } from 'app/modules/ix-table/directives/ix-table-empty.directive'; import { TreeModule } from 'app/modules/ix-tree/tree.module'; -import { AppLoaderModule } from 'app/modules/loader/app-loader.module'; +import { FakeProgressBarComponent } from 'app/modules/loader/components/fake-progress-bar/fake-progress-bar.component'; import { PageHeaderModule } from 'app/modules/page-header/page-header.module'; import { FileSizePipe } from 'app/modules/pipes/file-size/file-size.pipe'; import { OrNotAvailablePipe } from 'app/modules/pipes/or-not-available/or-not-available.pipe'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestDirective } from 'app/modules/test-id/test.directive'; import { DataProtectionCardComponent } from 'app/pages/datasets/components/data-protection-card/data-protection-card.component'; import { DatasetDetailsCardComponent } from 'app/pages/datasets/components/dataset-details-card/dataset-details-card.component'; import { DatasetDetailsPanelComponent } from 'app/pages/datasets/components/dataset-details-panel/dataset-details-panel.component'; @@ -90,9 +90,7 @@ import { DatasetNodeComponent } from './components/dataset-node/dataset-node.com MatDialogModule, EntityModule, NgxSkeletonLoaderModule, - AppLoaderModule, SnapshotsModule, - TestIdModule, EmptyComponent, SearchInput1Component, CdkTreeNodePadding, @@ -121,6 +119,8 @@ import { DatasetNodeComponent } from './components/dataset-node/dataset-node.com IxTableBodyComponent, IxTablePagerComponent, IxTableEmptyDirective, + FakeProgressBarComponent, + TestDirective, ], declarations: [ DatasetsManagementComponent, diff --git a/src/app/pages/datasets/modules/encryption/components/encyption-options-dialog/encryption-options-dialog.component.spec.ts b/src/app/pages/datasets/modules/encryption/components/encyption-options-dialog/encryption-options-dialog.component.spec.ts index ffb368078c8..51e2c332a53 100644 --- a/src/app/pages/datasets/modules/encryption/components/encyption-options-dialog/encryption-options-dialog.component.spec.ts +++ b/src/app/pages/datasets/modules/encryption/components/encyption-options-dialog/encryption-options-dialog.component.spec.ts @@ -12,7 +12,6 @@ import { Dataset } from 'app/interfaces/dataset.interface'; import { DialogService } from 'app/modules/dialog/dialog.service'; import { IxSelectHarness } from 'app/modules/forms/ix-forms/components/ix-select/ix-select.harness'; import { IxFormHarness } from 'app/modules/forms/ix-forms/testing/ix-form.harness'; -import { AppLoaderModule } from 'app/modules/loader/app-loader.module'; import { SnackbarModule } from 'app/modules/snackbar/snackbar.module'; import { EncryptionOptionsDialogComponent } from 'app/pages/datasets/modules/encryption/components/encyption-options-dialog/encryption-options-dialog.component'; import { WebSocketService } from 'app/services/ws.service'; @@ -28,7 +27,6 @@ describe('EncryptionOptionsDialogComponent', () => { component: EncryptionOptionsDialogComponent, imports: [ ReactiveFormsModule, - AppLoaderModule, SnackbarModule, ], providers: [ diff --git a/src/app/pages/datasets/modules/encryption/components/export-all-keys-dialog/export-all-keys-dialog.component.spec.ts b/src/app/pages/datasets/modules/encryption/components/export-all-keys-dialog/export-all-keys-dialog.component.spec.ts index 73ff3198e49..7e106801e3b 100644 --- a/src/app/pages/datasets/modules/encryption/components/export-all-keys-dialog/export-all-keys-dialog.component.spec.ts +++ b/src/app/pages/datasets/modules/encryption/components/export-all-keys-dialog/export-all-keys-dialog.component.spec.ts @@ -8,7 +8,6 @@ import { fakeSuccessfulJob } from 'app/core/testing/utils/fake-job.utils'; import { mockCall, mockJob, mockWebSocket } from 'app/core/testing/utils/mock-websocket.utils'; import { Dataset } from 'app/interfaces/dataset.interface'; import { DialogService } from 'app/modules/dialog/dialog.service'; -import { AppLoaderModule } from 'app/modules/loader/app-loader.module'; import { ExportAllKeysDialogComponent } from 'app/pages/datasets/modules/encryption/components/export-all-keys-dialog/export-all-keys-dialog.component'; import { DownloadService } from 'app/services/download.service'; import { WebSocketService } from 'app/services/ws.service'; @@ -19,7 +18,6 @@ describe('ExportAllKeysDialogComponent', () => { const createComponent = createComponentFactory({ component: ExportAllKeysDialogComponent, imports: [ - AppLoaderModule, ], providers: [ mockWebSocket([ diff --git a/src/app/pages/datasets/modules/encryption/components/export-dataset-key-dialog/export-dataset-key-dialog.component.spec.ts b/src/app/pages/datasets/modules/encryption/components/export-dataset-key-dialog/export-dataset-key-dialog.component.spec.ts index d815b8952fc..a3e3b49a7f4 100644 --- a/src/app/pages/datasets/modules/encryption/components/export-dataset-key-dialog/export-dataset-key-dialog.component.spec.ts +++ b/src/app/pages/datasets/modules/encryption/components/export-dataset-key-dialog/export-dataset-key-dialog.component.spec.ts @@ -7,7 +7,6 @@ import { of } from 'rxjs'; import { fakeSuccessfulJob } from 'app/core/testing/utils/fake-job.utils'; import { mockCall, mockJob, mockWebSocket } from 'app/core/testing/utils/mock-websocket.utils'; import { Dataset } from 'app/interfaces/dataset.interface'; -import { AppLoaderModule } from 'app/modules/loader/app-loader.module'; import { DownloadService } from 'app/services/download.service'; import { WebSocketService } from 'app/services/ws.service'; import { ExportDatasetKeyDialogComponent } from './export-dataset-key-dialog.component'; @@ -18,7 +17,6 @@ describe('ExportDatasetKeyDialogComponent', () => { const createComponent = createComponentFactory({ component: ExportDatasetKeyDialogComponent, imports: [ - AppLoaderModule, ], providers: [ mockWebSocket([ diff --git a/src/app/pages/datasets/modules/encryption/encryption.module.ts b/src/app/pages/datasets/modules/encryption/encryption.module.ts index 04f51851443..2d9dabc4629 100644 --- a/src/app/pages/datasets/modules/encryption/encryption.module.ts +++ b/src/app/pages/datasets/modules/encryption/encryption.module.ts @@ -19,7 +19,7 @@ import { IxRadioGroupComponent } from 'app/modules/forms/ix-forms/components/ix- import { IxSelectComponent } from 'app/modules/forms/ix-forms/components/ix-select/ix-select.component'; import { IxTextareaComponent } from 'app/modules/forms/ix-forms/components/ix-textarea/ix-textarea.component'; import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestDirective } from 'app/modules/test-id/test.directive'; import { DatasetUnlockComponent } from 'app/pages/datasets/modules/encryption/components/dataset-unlock/dataset-unlock.component'; import { EncryptionOptionsDialogComponent, @@ -42,7 +42,6 @@ import { LockDatasetDialogComponent } from './components/lock-dataset-dialog/loc EntityModule, ReactiveFormsModule, MatDialogModule, - TestIdModule, IxIconComponent, IxCheckboxComponent, IxRadioGroupComponent, @@ -55,6 +54,7 @@ import { LockDatasetDialogComponent } from './components/lock-dataset-dialog/loc FormActionsComponent, AsyncPipe, RequiresRolesDirective, + TestDirective, ], exports: [ ZfsEncryptionCardComponent, diff --git a/src/app/pages/datasets/modules/permissions/components/save-as-preset-modal/save-as-preset-modal.component.spec.ts b/src/app/pages/datasets/modules/permissions/components/save-as-preset-modal/save-as-preset-modal.component.spec.ts index f41bcdae220..22e8ee258e9 100644 --- a/src/app/pages/datasets/modules/permissions/components/save-as-preset-modal/save-as-preset-modal.component.spec.ts +++ b/src/app/pages/datasets/modules/permissions/components/save-as-preset-modal/save-as-preset-modal.component.spec.ts @@ -10,7 +10,6 @@ import { AclType } from 'app/enums/acl-type.enum'; import { Acl, AclTemplateByPath } from 'app/interfaces/acl.interface'; import { DialogService } from 'app/modules/dialog/dialog.service'; import { IxInputHarness } from 'app/modules/forms/ix-forms/components/ix-input/ix-input.harness'; -import { AppLoaderModule } from 'app/modules/loader/app-loader.module'; import { SaveAsPresetModalComponent } from 'app/pages/datasets/modules/permissions/components/save-as-preset-modal/save-as-preset-modal.component'; import { SaveAsPresetModalConfig } from 'app/pages/datasets/modules/permissions/interfaces/save-as-preset-modal-config.interface'; import { DatasetAclEditorStore } from 'app/pages/datasets/modules/permissions/stores/dataset-acl-editor.store'; @@ -23,7 +22,6 @@ describe('SaveAsPresetModalComponent', () => { const createComponent = createComponentFactory({ component: SaveAsPresetModalComponent, imports: [ - AppLoaderModule, ReactiveFormsModule, ], providers: [ diff --git a/src/app/pages/datasets/modules/permissions/components/select-preset-modal/select-preset-modal.component.spec.ts b/src/app/pages/datasets/modules/permissions/components/select-preset-modal/select-preset-modal.component.spec.ts index 0ffda5aa626..f1412461b9b 100644 --- a/src/app/pages/datasets/modules/permissions/components/select-preset-modal/select-preset-modal.component.spec.ts +++ b/src/app/pages/datasets/modules/permissions/components/select-preset-modal/select-preset-modal.component.spec.ts @@ -11,7 +11,6 @@ import { AclTemplateByPath } from 'app/interfaces/acl.interface'; import { DialogService } from 'app/modules/dialog/dialog.service'; import { IxRadioGroupHarness } from 'app/modules/forms/ix-forms/components/ix-radio-group/ix-radio-group.harness'; import { IxSelectHarness } from 'app/modules/forms/ix-forms/components/ix-select/ix-select.harness'; -import { AppLoaderModule } from 'app/modules/loader/app-loader.module'; import { SelectPresetModalConfig, } from 'app/pages/datasets/modules/permissions/interfaces/select-preset-modal-config.interface'; @@ -49,7 +48,6 @@ describe('SelectPresetModalComponent', () => { const createComponent = createComponentFactory({ component: SelectPresetModalComponent, imports: [ - AppLoaderModule, ReactiveFormsModule, ], providers: [ diff --git a/src/app/pages/datasets/modules/permissions/permissions.module.ts b/src/app/pages/datasets/modules/permissions/permissions.module.ts index 4d5e0c7f40b..81a0e2e1aff 100644 --- a/src/app/pages/datasets/modules/permissions/permissions.module.ts +++ b/src/app/pages/datasets/modules/permissions/permissions.module.ts @@ -25,7 +25,7 @@ import { IxRadioGroupComponent } from 'app/modules/forms/ix-forms/components/ix- import { IxSelectComponent } from 'app/modules/forms/ix-forms/components/ix-select/ix-select.component'; import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; import { CastPipe } from 'app/modules/pipes/cast/cast.pipe'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestDirective } from 'app/modules/test-id/test.directive'; import { AclEditorListComponent, } from 'app/pages/datasets/modules/permissions/components/acl-editor-list/acl-editor-list.component'; @@ -80,7 +80,6 @@ import { StripAclModalComponent } from './components/strip-acl-modal/strip-acl-m MatButtonModule, MatDialogModule, NgxSkeletonLoaderModule, - TestIdModule, EmptyComponent, CastPipe, IxSelectComponent, @@ -95,6 +94,7 @@ import { StripAclModalComponent } from './components/strip-acl-modal/strip-acl-m AsyncPipe, NgClass, RequiresRolesDirective, + TestDirective, ], declarations: [ AclEditorListComponent, diff --git a/src/app/pages/datasets/modules/snapshots/snapshot-batch-delete-dialog/snapshot-batch-delete-dialog.component.spec.ts b/src/app/pages/datasets/modules/snapshots/snapshot-batch-delete-dialog/snapshot-batch-delete-dialog.component.spec.ts index fb2e9bc0b69..021ed94d878 100644 --- a/src/app/pages/datasets/modules/snapshots/snapshot-batch-delete-dialog/snapshot-batch-delete-dialog.component.spec.ts +++ b/src/app/pages/datasets/modules/snapshots/snapshot-batch-delete-dialog/snapshot-batch-delete-dialog.component.spec.ts @@ -10,7 +10,6 @@ import { mockCall, mockJob, mockWebSocket } from 'app/core/testing/utils/mock-we import { CoreBulkResponse } from 'app/interfaces/core-bulk.interface'; import { DialogService } from 'app/modules/dialog/dialog.service'; import { IxFormHarness } from 'app/modules/forms/ix-forms/testing/ix-form.harness'; -import { AppLoaderModule } from 'app/modules/loader/app-loader.module'; import { AppLoaderService } from 'app/modules/loader/app-loader.service'; import { SnapshotBatchDeleteDialogComponent } from 'app/pages/datasets/modules/snapshots/snapshot-batch-delete-dialog/snapshot-batch-delete-dialog.component'; import { fakeZfsSnapshotDataSource } from 'app/pages/datasets/modules/snapshots/testing/snapshot-fake-datasource'; @@ -29,7 +28,6 @@ describe('SnapshotBatchDeleteDialogComponent', () => { const createComponent = createComponentFactory({ component: SnapshotBatchDeleteDialogComponent, imports: [ - AppLoaderModule, ReactiveFormsModule, ], providers: [ diff --git a/src/app/pages/datasets/modules/snapshots/snapshot-clone-dialog/snapshot-clone-dialog.component.spec.ts b/src/app/pages/datasets/modules/snapshots/snapshot-clone-dialog/snapshot-clone-dialog.component.spec.ts index c910ab6b4b8..b3f23fd8d83 100644 --- a/src/app/pages/datasets/modules/snapshots/snapshot-clone-dialog/snapshot-clone-dialog.component.spec.ts +++ b/src/app/pages/datasets/modules/snapshots/snapshot-clone-dialog/snapshot-clone-dialog.component.spec.ts @@ -8,7 +8,6 @@ import { mockAuth } from 'app/core/testing/utils/mock-auth.utils'; import { mockCall, mockWebSocket } from 'app/core/testing/utils/mock-websocket.utils'; import { DialogService } from 'app/modules/dialog/dialog.service'; import { IxInputHarness } from 'app/modules/forms/ix-forms/components/ix-input/ix-input.harness'; -import { AppLoaderModule } from 'app/modules/loader/app-loader.module'; import { WebSocketService } from 'app/services/ws.service'; import { SnapshotCloneDialogComponent } from './snapshot-clone-dialog.component'; @@ -18,7 +17,6 @@ describe('SnapshotCloneDialogComponent', () => { const createComponent = createComponentFactory({ component: SnapshotCloneDialogComponent, imports: [ - AppLoaderModule, ReactiveFormsModule, ], providers: [ diff --git a/src/app/pages/datasets/modules/snapshots/snapshot-details-row/snapshot-details-row.component.spec.ts b/src/app/pages/datasets/modules/snapshots/snapshot-details-row/snapshot-details-row.component.spec.ts index 6c329c27f6e..934e442c99b 100644 --- a/src/app/pages/datasets/modules/snapshots/snapshot-details-row/snapshot-details-row.component.spec.ts +++ b/src/app/pages/datasets/modules/snapshots/snapshot-details-row/snapshot-details-row.component.spec.ts @@ -10,7 +10,6 @@ import { mockAuth } from 'app/core/testing/utils/mock-auth.utils'; import { mockWebSocket, mockCall } from 'app/core/testing/utils/mock-websocket.utils'; import { DialogService } from 'app/modules/dialog/dialog.service'; import { IxCheckboxHarness } from 'app/modules/forms/ix-forms/components/ix-checkbox/ix-checkbox.harness'; -import { AppLoaderModule } from 'app/modules/loader/app-loader.module'; import { AppLoaderService } from 'app/modules/loader/app-loader.service'; import { FileSizePipe } from 'app/modules/pipes/file-size/file-size.pipe'; import { FormatDateTimePipe } from 'app/modules/pipes/format-date-time/format-datetime.pipe'; @@ -28,7 +27,6 @@ describe('SnapshotDetailsRowComponent', () => { const createComponent = createRoutingFactory({ component: SnapshotDetailsRowComponent, imports: [ - AppLoaderModule, ReactiveFormsModule, FileSizePipe, FormatDateTimePipe, diff --git a/src/app/pages/datasets/modules/snapshots/snapshot-rollback-dialog/snapshot-rollback-dialog.component.spec.ts b/src/app/pages/datasets/modules/snapshots/snapshot-rollback-dialog/snapshot-rollback-dialog.component.spec.ts index 2a7a99c0a3d..e943dc27f31 100644 --- a/src/app/pages/datasets/modules/snapshots/snapshot-rollback-dialog/snapshot-rollback-dialog.component.spec.ts +++ b/src/app/pages/datasets/modules/snapshots/snapshot-rollback-dialog/snapshot-rollback-dialog.component.spec.ts @@ -9,7 +9,6 @@ import { mockAuth } from 'app/core/testing/utils/mock-auth.utils'; import { mockCall, mockWebSocket } from 'app/core/testing/utils/mock-websocket.utils'; import { DialogService } from 'app/modules/dialog/dialog.service'; import { IxFormHarness } from 'app/modules/forms/ix-forms/testing/ix-form.harness'; -import { AppLoaderModule } from 'app/modules/loader/app-loader.module'; import { fakeZfsSnapshot } from 'app/pages/datasets/modules/snapshots//testing/snapshot-fake-datasource'; import { SnapshotRollbackDialogComponent } from 'app/pages/datasets/modules/snapshots/snapshot-rollback-dialog/snapshot-rollback-dialog.component'; import { WebSocketService } from 'app/services/ws.service'; @@ -21,7 +20,6 @@ describe('SnapshotRollbackDialogComponent', () => { const createComponent = createComponentFactory({ component: SnapshotRollbackDialogComponent, imports: [ - AppLoaderModule, ReactiveFormsModule, ], declarations: [ diff --git a/src/app/pages/datasets/modules/snapshots/snapshots.module.ts b/src/app/pages/datasets/modules/snapshots/snapshots.module.ts index adf64ecb38f..046983f4c29 100644 --- a/src/app/pages/datasets/modules/snapshots/snapshots.module.ts +++ b/src/app/pages/datasets/modules/snapshots/snapshots.module.ts @@ -43,7 +43,7 @@ import { IxTableEmptyDirective } from 'app/modules/ix-table/directives/ix-table- import { PageHeaderModule } from 'app/modules/page-header/page-header.module'; import { FileSizePipe } from 'app/modules/pipes/file-size/file-size.pipe'; import { FormatDateTimePipe } from 'app/modules/pipes/format-date-time/format-datetime.pipe'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestDirective } from 'app/modules/test-id/test.directive'; import { SnapshotCloneDialogComponent } from 'app/pages/datasets/modules/snapshots/snapshot-clone-dialog/snapshot-clone-dialog.component'; import { SnapshotDetailsRowComponent } from 'app/pages/datasets/modules/snapshots/snapshot-details-row/snapshot-details-row.component'; import { SnapshotListComponent } from 'app/pages/datasets/modules/snapshots/snapshot-list/snapshot-list.component'; @@ -88,7 +88,6 @@ const components = [ routing, SearchInput1Component, StoreModule.forFeature(snapshotStateKey, snapshotReducer), - TestIdModule, TranslateModule, FileSizePipe, FormatDateTimePipe, @@ -109,6 +108,7 @@ const components = [ IxTableBodyComponent, IxTableDetailsRowDirective, IxTablePagerComponent, + TestDirective, ], declarations: [ ...components, diff --git a/src/app/pages/directory-service/components/leave-domain-dialog/leave-domain-dialog.component.spec.ts b/src/app/pages/directory-service/components/leave-domain-dialog/leave-domain-dialog.component.spec.ts index 6d80b7f2c81..073f02c6121 100644 --- a/src/app/pages/directory-service/components/leave-domain-dialog/leave-domain-dialog.component.spec.ts +++ b/src/app/pages/directory-service/components/leave-domain-dialog/leave-domain-dialog.component.spec.ts @@ -9,7 +9,6 @@ import { mockAuth } from 'app/core/testing/utils/mock-auth.utils'; import { mockJob, mockWebSocket } from 'app/core/testing/utils/mock-websocket.utils'; import { DialogService } from 'app/modules/dialog/dialog.service'; import { IxFormHarness } from 'app/modules/forms/ix-forms/testing/ix-form.harness'; -import { AppLoaderModule } from 'app/modules/loader/app-loader.module'; import { SnackbarService } from 'app/modules/snackbar/services/snackbar.service'; import { WebSocketService } from 'app/services/ws.service'; import { LeaveDomainDialogComponent } from './leave-domain-dialog.component'; @@ -21,7 +20,6 @@ describe('LeaveDomainDialogComponent', () => { component: LeaveDomainDialogComponent, imports: [ ReactiveFormsModule, - AppLoaderModule, ], providers: [ mockWebSocket([ diff --git a/src/app/pages/directory-service/directory-service.module.ts b/src/app/pages/directory-service/directory-service.module.ts index da861e7ee2f..9bc2fd66949 100644 --- a/src/app/pages/directory-service/directory-service.module.ts +++ b/src/app/pages/directory-service/directory-service.module.ts @@ -34,7 +34,7 @@ import { IxTableHeadComponent } from 'app/modules/ix-table/components/ix-table-h import { IxTablePagerComponent } from 'app/modules/ix-table/components/ix-table-pager/ix-table-pager.component'; import { IxTableEmptyDirective } from 'app/modules/ix-table/directives/ix-table-empty.directive'; import { PageHeaderModule } from 'app/modules/page-header/page-header.module'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestDirective } from 'app/modules/test-id/test.directive'; import { ActiveDirectoryComponent } from 'app/pages/directory-service/components/active-directory/active-directory.component'; import { IdmapFormComponent } from 'app/pages/directory-service/components/idmap-form/idmap-form.component'; import { IdmapListComponent } from 'app/pages/directory-service/components/idmap-list/idmap-list.component'; @@ -65,7 +65,6 @@ import { LdapComponent } from './components/ldap/ldap.component'; TranslateModule, CdkAccordionModule, MatDialogModule, - TestIdModule, SearchInput1Component, EmptyComponent, IxChipsComponent, @@ -87,6 +86,7 @@ import { LdapComponent } from './components/ldap/ldap.component'; IxTableBodyComponent, IxTablePagerComponent, IxTableEmptyDirective, + TestDirective, ], declarations: [ LdapComponent, diff --git a/src/app/pages/jobs/jobs-list.module.ts b/src/app/pages/jobs/jobs-list.module.ts index bd35d9b6427..b67cadabf21 100644 --- a/src/app/pages/jobs/jobs-list.module.ts +++ b/src/app/pages/jobs/jobs-list.module.ts @@ -26,7 +26,7 @@ import { IxTableDetailsRowDirective } from 'app/modules/ix-table/directives/ix-t import { IxTableEmptyDirective } from 'app/modules/ix-table/directives/ix-table-empty.directive'; import { PageHeaderModule } from 'app/modules/page-header/page-header.module'; import { MapValuePipe } from 'app/modules/pipes/map-value/map-value.pipe'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestDirective } from 'app/modules/test-id/test.directive'; import { JobLogsRowComponent } from 'app/pages/jobs/job-logs-row/job-logs-row.component'; import { JobNameComponent } from 'app/pages/jobs/job-name/job-name.component'; import { routing } from 'app/pages/jobs/jobs-list.routing'; @@ -46,7 +46,6 @@ import { JobsListComponent } from './jobs-list/jobs-list.component'; routing, MatSortModule, MatButtonToggleModule, - TestIdModule, SearchInput1Component, MapValuePipe, CopyButtonComponent, @@ -63,6 +62,7 @@ import { JobsListComponent } from './jobs-list/jobs-list.component'; IxTableCellDirective, IxTableDetailsRowDirective, IxTablePagerComponent, + TestDirective, ], declarations: [JobsListComponent, JobLogsRowComponent, JobNameComponent], }) diff --git a/src/app/pages/network/network.module.ts b/src/app/pages/network/network.module.ts index 6e36d152bb0..ab878d3b0cb 100644 --- a/src/app/pages/network/network.module.ts +++ b/src/app/pages/network/network.module.ts @@ -41,10 +41,13 @@ import { import { IxTableCellDirective } from 'app/modules/ix-table/directives/ix-table-cell.directive'; import { IxTableEmptyDirective } from 'app/modules/ix-table/directives/ix-table-empty.directive'; import { NgxOrderedListboxModule } from 'app/modules/lists/ordered-list/ordered-list.module'; -import { AppLoaderModule } from 'app/modules/loader/app-loader.module'; +import { FakeProgressBarComponent } from 'app/modules/loader/components/fake-progress-bar/fake-progress-bar.component'; +import { + WithLoadingStateDirective, +} from 'app/modules/loader/directives/with-loading-state/with-loading-state.directive'; import { CastPipe } from 'app/modules/pipes/cast/cast.pipe'; import { FormatDateTimePipe } from 'app/modules/pipes/format-date-time/format-datetime.pipe'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestDirective } from 'app/modules/test-id/test.directive'; import { NetworkConfigurationComponent } from 'app/pages/network/components/configuration/configuration.component'; import { DefaultGatewayDialogComponent, @@ -81,10 +84,8 @@ import { routing } from './network.routing'; MatToolbarModule, TranslateModule, MatDialogModule, - TestIdModule, NgxOrderedListboxModule, MatTooltipModule, - AppLoaderModule, InterfaceStatusIconComponent, EmptyComponent, CastPipe, @@ -110,6 +111,9 @@ import { routing } from './network.routing'; IxTableCellDirective, IxTableEmptyDirective, IxTablePagerShowMoreComponent, + FakeProgressBarComponent, + TestDirective, + WithLoadingStateDirective, ], declarations: [ DefaultGatewayDialogComponent, diff --git a/src/app/pages/reports-dashboard/reports-dashboard.module.ts b/src/app/pages/reports-dashboard/reports-dashboard.module.ts index a4dfb60f183..f12c2ef156a 100644 --- a/src/app/pages/reports-dashboard/reports-dashboard.module.ts +++ b/src/app/pages/reports-dashboard/reports-dashboard.module.ts @@ -34,12 +34,12 @@ import { IxTableBodyComponent } from 'app/modules/ix-table/components/ix-table-b import { IxTableHeadComponent } from 'app/modules/ix-table/components/ix-table-head/ix-table-head.component'; import { IxTablePagerComponent } from 'app/modules/ix-table/components/ix-table-pager/ix-table-pager.component'; import { IxTableEmptyDirective } from 'app/modules/ix-table/directives/ix-table-empty.directive'; -import { AppLoaderModule } from 'app/modules/loader/app-loader.module'; +import { FakeProgressBarComponent } from 'app/modules/loader/components/fake-progress-bar/fake-progress-bar.component'; import { PageHeaderModule } from 'app/modules/page-header/page-header.module'; import { FormatDateTimePipe } from 'app/modules/pipes/format-date-time/format-datetime.pipe'; import { IxDateComponent } from 'app/modules/pipes/ix-date/ix-date.component'; import { MapValuePipe } from 'app/modules/pipes/map-value/map-value.pipe'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestDirective } from 'app/modules/test-id/test.directive'; import { ReportingExportersFormComponent } from 'app/pages/reports-dashboard/components/exporters/reporting-exporters-form/reporting-exporters-form.component'; import { ReportingExporterListComponent } from 'app/pages/reports-dashboard/components/exporters/reporting-exporters-list/reporting-exporters-list.component'; import { LineChartComponent } from 'app/pages/reports-dashboard/components/line-chart/line-chart.component'; @@ -61,7 +61,6 @@ import { ReportsGlobalControlsComponent } from './components/reports-global-cont ScrollingModule, MatButtonModule, IxDateComponent, - AppLoaderModule, MatToolbarModule, TranslateModule, EntityModule, @@ -71,7 +70,6 @@ import { ReportsGlobalControlsComponent } from './components/reports-global-cont MatCardModule, MatButtonToggleModule, MatSlideToggleModule, - TestIdModule, MatDialogModule, EmptyComponent, SearchInput1Component, @@ -94,6 +92,8 @@ import { ReportsGlobalControlsComponent } from './components/reports-global-cont IxTableHeadComponent, IxTableBodyComponent, IxTablePagerComponent, + FakeProgressBarComponent, + TestDirective, ], declarations: [ LineChartComponent, diff --git a/src/app/pages/services/components/service-nfs/add-spn-dialog/add-spn-dialog.component.spec.ts b/src/app/pages/services/components/service-nfs/add-spn-dialog/add-spn-dialog.component.spec.ts index 31991bbdd76..c8db74ad98b 100644 --- a/src/app/pages/services/components/service-nfs/add-spn-dialog/add-spn-dialog.component.spec.ts +++ b/src/app/pages/services/components/service-nfs/add-spn-dialog/add-spn-dialog.component.spec.ts @@ -7,7 +7,6 @@ import { createComponentFactory, mockProvider, Spectator } from '@ngneat/spectat import { mockAuth } from 'app/core/testing/utils/mock-auth.utils'; import { mockCall, mockWebSocket } from 'app/core/testing/utils/mock-websocket.utils'; import { IxFormHarness } from 'app/modules/forms/ix-forms/testing/ix-form.harness'; -import { AppLoaderModule } from 'app/modules/loader/app-loader.module'; import { SnackbarService } from 'app/modules/snackbar/services/snackbar.service'; import { AddSpnDialogComponent } from 'app/pages/services/components/service-nfs/add-spn-dialog/add-spn-dialog.component'; import { WebSocketService } from 'app/services/ws.service'; @@ -19,7 +18,6 @@ describe('AddSpnDialogComponent', () => { component: AddSpnDialogComponent, imports: [ ReactiveFormsModule, - AppLoaderModule, ], providers: [ mockAuth(), diff --git a/src/app/pages/services/services.module.ts b/src/app/pages/services/services.module.ts index 87b77ee9b5a..2ec3408ae00 100644 --- a/src/app/pages/services/services.module.ts +++ b/src/app/pages/services/services.module.ts @@ -38,7 +38,7 @@ import { IxTableBodyComponent } from 'app/modules/ix-table/components/ix-table-b import { IxTableHeadComponent } from 'app/modules/ix-table/components/ix-table-head/ix-table-head.component'; import { IxTableEmptyDirective } from 'app/modules/ix-table/directives/ix-table-empty.directive'; import { PageHeaderModule } from 'app/modules/page-header/page-header.module'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestDirective } from 'app/modules/test-id/test.directive'; import { TooltipComponent } from 'app/modules/tooltip/tooltip.component'; import { ServiceFtpComponent } from 'app/pages/services/components/service-ftp/service-ftp.component'; import { AddSpnDialogComponent } from 'app/pages/services/components/service-nfs/add-spn-dialog/add-spn-dialog.component'; @@ -72,7 +72,6 @@ import { routing } from './services.routing'; MatCheckboxModule, MatButtonModule, MatDialogModule, - TestIdModule, SearchInput1Component, TooltipComponent, IxModalHeaderComponent, @@ -95,6 +94,7 @@ import { routing } from './services.routing'; IxTableHeadComponent, IxTableEmptyDirective, IxTableBodyComponent, + TestDirective, ], declarations: [ ServicesComponent, diff --git a/src/app/pages/sharing/components/shares-dashboard/iscsi-card/iscsi-card.component.spec.ts b/src/app/pages/sharing/components/shares-dashboard/iscsi-card/iscsi-card.component.spec.ts index aec73aa7a1a..a53508980c6 100644 --- a/src/app/pages/sharing/components/shares-dashboard/iscsi-card/iscsi-card.component.spec.ts +++ b/src/app/pages/sharing/components/shares-dashboard/iscsi-card/iscsi-card.component.spec.ts @@ -21,7 +21,6 @@ import { IxTableHarness } from 'app/modules/ix-table/components/ix-table/ix-tabl import { IxTablePagerShowMoreComponent, } from 'app/modules/ix-table/components/ix-table-pager-show-more/ix-table-pager-show-more.component'; -import { AppLoaderModule } from 'app/modules/loader/app-loader.module'; import { IscsiCardComponent } from 'app/pages/sharing/components/shares-dashboard/iscsi-card/iscsi-card.component'; import { ServiceExtraActionsComponent } from 'app/pages/sharing/components/shares-dashboard/service-extra-actions/service-extra-actions.component'; import { ServiceStateButtonComponent } from 'app/pages/sharing/components/shares-dashboard/service-state-button/service-state-button.component'; @@ -55,7 +54,6 @@ describe('IscsiCardComponent', () => { const createComponent = createComponentFactory({ component: IscsiCardComponent, imports: [ - AppLoaderModule, IxTablePagerShowMoreComponent, ], declarations: [ diff --git a/src/app/pages/sharing/components/shares-dashboard/smb-card/smb-card.component.spec.ts b/src/app/pages/sharing/components/shares-dashboard/smb-card/smb-card.component.spec.ts index b9539fac740..d62ffaafdbc 100644 --- a/src/app/pages/sharing/components/shares-dashboard/smb-card/smb-card.component.spec.ts +++ b/src/app/pages/sharing/components/shares-dashboard/smb-card/smb-card.component.spec.ts @@ -21,7 +21,6 @@ import { IxTableHarness } from 'app/modules/ix-table/components/ix-table/ix-tabl import { IxTablePagerShowMoreComponent, } from 'app/modules/ix-table/components/ix-table-pager-show-more/ix-table-pager-show-more.component'; -import { AppLoaderModule } from 'app/modules/loader/app-loader.module'; import { ServiceExtraActionsComponent } from 'app/pages/sharing/components/shares-dashboard/service-extra-actions/service-extra-actions.component'; import { ServiceStateButtonComponent } from 'app/pages/sharing/components/shares-dashboard/service-state-button/service-state-button.component'; import { SmbCardComponent } from 'app/pages/sharing/components/shares-dashboard/smb-card/smb-card.component'; @@ -56,7 +55,6 @@ describe('SmbCardComponent', () => { const createComponent = createComponentFactory({ component: SmbCardComponent, imports: [ - AppLoaderModule, IxTablePagerShowMoreComponent, ], declarations: [ diff --git a/src/app/pages/sharing/iscsi/associated-target/associated-target-list/associated-target-list.component.spec.ts b/src/app/pages/sharing/iscsi/associated-target/associated-target-list/associated-target-list.component.spec.ts index 4ec0f528ec3..0cdcf9454cc 100644 --- a/src/app/pages/sharing/iscsi/associated-target/associated-target-list/associated-target-list.component.spec.ts +++ b/src/app/pages/sharing/iscsi/associated-target/associated-target-list/associated-target-list.component.spec.ts @@ -15,7 +15,6 @@ import { IxTableHarness } from 'app/modules/ix-table/components/ix-table/ix-tabl import { IxTableColumnsSelectorComponent, } from 'app/modules/ix-table/components/ix-table-columns-selector/ix-table-columns-selector.component'; -import { AppLoaderModule } from 'app/modules/loader/app-loader.module'; import { AssociatedTargetFormComponent } from 'app/pages/sharing/iscsi/associated-target/associated-target-form/associated-target-form.component'; import { AssociatedTargetListComponent } from 'app/pages/sharing/iscsi/associated-target/associated-target-list/associated-target-list.component'; import { IxSlideInService } from 'app/services/ix-slide-in.service'; @@ -46,7 +45,6 @@ describe('AssociatedTargetListComponent', () => { const createComponent = createComponentFactory({ component: AssociatedTargetListComponent, imports: [ - AppLoaderModule, SearchInput1Component, IxTableColumnsSelectorComponent, ], diff --git a/src/app/pages/sharing/iscsi/extent/extent-list/extent-list.component.spec.ts b/src/app/pages/sharing/iscsi/extent/extent-list/extent-list.component.spec.ts index 1304647e9de..6c50f160648 100644 --- a/src/app/pages/sharing/iscsi/extent/extent-list/extent-list.component.spec.ts +++ b/src/app/pages/sharing/iscsi/extent/extent-list/extent-list.component.spec.ts @@ -16,7 +16,6 @@ import { IxTableHarness } from 'app/modules/ix-table/components/ix-table/ix-tabl import { IxTableColumnsSelectorComponent, } from 'app/modules/ix-table/components/ix-table-columns-selector/ix-table-columns-selector.component'; -import { AppLoaderModule } from 'app/modules/loader/app-loader.module'; import { ExtentFormComponent } from 'app/pages/sharing/iscsi/extent/extent-form/extent-form.component'; import { DeleteExtentDialogComponent } from 'app/pages/sharing/iscsi/extent/extent-list/delete-extent-dialog/delete-extent-dialog.component'; import { ExtentListComponent } from 'app/pages/sharing/iscsi/extent/extent-list/extent-list.component'; @@ -42,7 +41,6 @@ describe('ExtentListComponent', () => { const createComponent = createComponentFactory({ component: ExtentListComponent, imports: [ - AppLoaderModule, SearchInput1Component, IxTableColumnsSelectorComponent, ], diff --git a/src/app/pages/sharing/iscsi/initiator/initiator-list/initiator-list.component.spec.ts b/src/app/pages/sharing/iscsi/initiator/initiator-list/initiator-list.component.spec.ts index 2dd442feb06..4a237184a53 100644 --- a/src/app/pages/sharing/iscsi/initiator/initiator-list/initiator-list.component.spec.ts +++ b/src/app/pages/sharing/iscsi/initiator/initiator-list/initiator-list.component.spec.ts @@ -18,7 +18,6 @@ import { IxTableHarness } from 'app/modules/ix-table/components/ix-table/ix-tabl import { IxTableColumnsSelectorComponent, } from 'app/modules/ix-table/components/ix-table-columns-selector/ix-table-columns-selector.component'; -import { AppLoaderModule } from 'app/modules/loader/app-loader.module'; import { InitiatorListComponent } from 'app/pages/sharing/iscsi/initiator/initiator-list/initiator-list.component'; import { IxSlideInService } from 'app/services/ix-slide-in.service'; import { WebSocketService } from 'app/services/ws.service'; @@ -38,7 +37,6 @@ describe('InitiatorListComponent', () => { const createComponent = createRoutingFactory({ component: InitiatorListComponent, imports: [ - AppLoaderModule, SearchInput1Component, IxTableColumnsSelectorComponent, ], diff --git a/src/app/pages/sharing/iscsi/portal/portal-list/portal-list.component.spec.ts b/src/app/pages/sharing/iscsi/portal/portal-list/portal-list.component.spec.ts index 33b5d3d47cc..901b81533d7 100644 --- a/src/app/pages/sharing/iscsi/portal/portal-list/portal-list.component.spec.ts +++ b/src/app/pages/sharing/iscsi/portal/portal-list/portal-list.component.spec.ts @@ -18,7 +18,6 @@ import { IxTableHarness } from 'app/modules/ix-table/components/ix-table/ix-tabl import { IxTableColumnsSelectorComponent, } from 'app/modules/ix-table/components/ix-table-columns-selector/ix-table-columns-selector.component'; -import { AppLoaderModule } from 'app/modules/loader/app-loader.module'; import { PortalFormComponent } from 'app/pages/sharing/iscsi/portal/portal-form/portal-form.component'; import { PortalListComponent } from 'app/pages/sharing/iscsi/portal/portal-list/portal-list.component'; import { IxSlideInService } from 'app/services/ix-slide-in.service'; @@ -46,7 +45,6 @@ describe('PortalListComponent', () => { const createComponent = createRoutingFactory({ component: PortalListComponent, imports: [ - AppLoaderModule, SearchInput1Component, IxTableColumnsSelectorComponent, ], diff --git a/src/app/pages/sharing/iscsi/target/target-list/target-list.component.spec.ts b/src/app/pages/sharing/iscsi/target/target-list/target-list.component.spec.ts index 7d4f3796733..de2c8ebefea 100644 --- a/src/app/pages/sharing/iscsi/target/target-list/target-list.component.spec.ts +++ b/src/app/pages/sharing/iscsi/target/target-list/target-list.component.spec.ts @@ -15,7 +15,6 @@ import { IxTableHarness } from 'app/modules/ix-table/components/ix-table/ix-tabl import { IxTableColumnsSelectorComponent, } from 'app/modules/ix-table/components/ix-table-columns-selector/ix-table-columns-selector.component'; -import { AppLoaderModule } from 'app/modules/loader/app-loader.module'; import { TargetFormComponent } from 'app/pages/sharing/iscsi/target/target-form/target-form.component'; import { TargetListComponent } from 'app/pages/sharing/iscsi/target/target-list/target-list.component'; import { IxSlideInService } from 'app/services/ix-slide-in.service'; @@ -35,7 +34,6 @@ describe('TargetListComponent', () => { const createComponent = createComponentFactory({ component: TargetListComponent, imports: [ - AppLoaderModule, SearchInput1Component, IxTableColumnsSelectorComponent, ], diff --git a/src/app/pages/sharing/nfs/nfs-list/nfs-list.component.spec.ts b/src/app/pages/sharing/nfs/nfs-list/nfs-list.component.spec.ts index c6922f466c0..903db693ddd 100644 --- a/src/app/pages/sharing/nfs/nfs-list/nfs-list.component.spec.ts +++ b/src/app/pages/sharing/nfs/nfs-list/nfs-list.component.spec.ts @@ -15,7 +15,6 @@ import { IxTableHarness } from 'app/modules/ix-table/components/ix-table/ix-tabl import { IxTableColumnsSelectorComponent, } from 'app/modules/ix-table/components/ix-table-columns-selector/ix-table-columns-selector.component'; -import { AppLoaderModule } from 'app/modules/loader/app-loader.module'; import { NfsFormComponent } from 'app/pages/sharing/nfs/nfs-form/nfs-form.component'; import { NfsListComponent } from 'app/pages/sharing/nfs/nfs-list/nfs-list.component'; import { IxSlideInService } from 'app/services/ix-slide-in.service'; @@ -40,7 +39,6 @@ describe('NfsListComponent', () => { const createComponent = createComponentFactory({ component: NfsListComponent, imports: [ - AppLoaderModule, SearchInput1Component, IxTableColumnsSelectorComponent, ], diff --git a/src/app/pages/sharing/nfs/nfs-session-list/nfs-session-list.component.spec.ts b/src/app/pages/sharing/nfs/nfs-session-list/nfs-session-list.component.spec.ts index a954517cad2..42513065526 100644 --- a/src/app/pages/sharing/nfs/nfs-session-list/nfs-session-list.component.spec.ts +++ b/src/app/pages/sharing/nfs/nfs-session-list/nfs-session-list.component.spec.ts @@ -11,7 +11,6 @@ import { IxTableHarness } from 'app/modules/ix-table/components/ix-table/ix-tabl import { IxTableColumnsSelectorComponent, } from 'app/modules/ix-table/components/ix-table-columns-selector/ix-table-columns-selector.component'; -import { AppLoaderModule } from 'app/modules/loader/app-loader.module'; import { PageHeaderModule } from 'app/modules/page-header/page-header.module'; import { NfsSessionListComponent } from './nfs-session-list.component'; @@ -48,7 +47,6 @@ describe('NfsSessionListComponent', () => { const createComponent = createComponentFactory({ component: NfsSessionListComponent, imports: [ - AppLoaderModule, MatButtonToggleModule, MockModule(PageHeaderModule), SearchInput1Component, diff --git a/src/app/pages/sharing/sharing.module.ts b/src/app/pages/sharing/sharing.module.ts index 76c50f73653..916ba478f30 100644 --- a/src/app/pages/sharing/sharing.module.ts +++ b/src/app/pages/sharing/sharing.module.ts @@ -1,5 +1,5 @@ import { - AsyncPipe, LowerCasePipe, NgClass, + AsyncPipe, LowerCasePipe, NgClass, NgTemplateOutlet, } from '@angular/common'; import { NgModule } from '@angular/core'; import { ReactiveFormsModule } from '@angular/forms'; @@ -50,12 +50,13 @@ import { IxTablePagerComponent } from 'app/modules/ix-table/components/ix-table- import { IxTablePagerShowMoreComponent, } from 'app/modules/ix-table/components/ix-table-pager-show-more/ix-table-pager-show-more.component'; +import { IxTableDetailsRowDirective } from 'app/modules/ix-table/directives/ix-table-details-row.directive'; import { IxTableEmptyDirective } from 'app/modules/ix-table/directives/ix-table-empty.directive'; import { DualListModule } from 'app/modules/lists/dual-list/dual-list.module'; -import { AppLoaderModule } from 'app/modules/loader/app-loader.module'; +import { FakeProgressBarComponent } from 'app/modules/loader/components/fake-progress-bar/fake-progress-bar.component'; import { PageHeaderModule } from 'app/modules/page-header/page-header.module'; import { MapValuePipe } from 'app/modules/pipes/map-value/map-value.pipe'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestDirective } from 'app/modules/test-id/test.directive'; import { IscsiCardComponent } from 'app/pages/sharing/components/shares-dashboard/iscsi-card/iscsi-card.component'; import { NfsCardComponent } from 'app/pages/sharing/components/shares-dashboard/nfs-card/nfs-card.component'; import { SmbCardComponent } from 'app/pages/sharing/components/shares-dashboard/smb-card/smb-card.component'; @@ -111,10 +112,8 @@ import { SmbStatusComponent } from './smb/smb-status/smb-status.component'; MatMenuModule, MatFormFieldModule, MatTooltipModule, - AppLoaderModule, MatButtonModule, MatProgressSpinnerModule, - TestIdModule, MatStepperModule, DualListModule, MatToolbarModule, @@ -148,6 +147,10 @@ import { SmbStatusComponent } from './smb/smb-status/smb-status.component'; IxTablePagerShowMoreComponent, IxTablePagerComponent, IxTableColumnsSelectorComponent, + FakeProgressBarComponent, + TestDirective, + NgTemplateOutlet, + IxTableDetailsRowDirective, ], declarations: [ NfsListComponent, diff --git a/src/app/pages/sharing/smb/smb-status/components/smb-lock-list/smb-lock-list.component.spec.ts b/src/app/pages/sharing/smb/smb-status/components/smb-lock-list/smb-lock-list.component.spec.ts index 1599496a9d6..135db7886ce 100644 --- a/src/app/pages/sharing/smb/smb-status/components/smb-lock-list/smb-lock-list.component.spec.ts +++ b/src/app/pages/sharing/smb/smb-status/components/smb-lock-list/smb-lock-list.component.spec.ts @@ -11,7 +11,6 @@ import { IxTableColumnsSelectorComponent, } from 'app/modules/ix-table/components/ix-table-columns-selector/ix-table-columns-selector.component'; import { IxTableDetailsRowDirective } from 'app/modules/ix-table/directives/ix-table-details-row.directive'; -import { AppLoaderModule } from 'app/modules/loader/app-loader.module'; import { SmbLockListComponent } from 'app/pages/sharing/smb/smb-status/components/smb-lock-list/smb-lock-list.component'; describe('SmbLockListComponent', () => { @@ -65,7 +64,6 @@ describe('SmbLockListComponent', () => { const createComponent = createComponentFactory({ component: SmbLockListComponent, imports: [ - AppLoaderModule, SearchInput1Component, IxTableColumnsSelectorComponent, IxTableDetailsRowDirective, diff --git a/src/app/pages/sharing/smb/smb-status/components/smb-notification-list/smb-notification-list.component.spec.ts b/src/app/pages/sharing/smb/smb-status/components/smb-notification-list/smb-notification-list.component.spec.ts index ad469b84df2..6bf9992269f 100644 --- a/src/app/pages/sharing/smb/smb-status/components/smb-notification-list/smb-notification-list.component.spec.ts +++ b/src/app/pages/sharing/smb/smb-status/components/smb-notification-list/smb-notification-list.component.spec.ts @@ -10,7 +10,6 @@ import { IxTableHarness } from 'app/modules/ix-table/components/ix-table/ix-tabl import { IxTableColumnsSelectorComponent, } from 'app/modules/ix-table/components/ix-table-columns-selector/ix-table-columns-selector.component'; -import { AppLoaderModule } from 'app/modules/loader/app-loader.module'; import { SmbNotificationListComponent } from 'app/pages/sharing/smb/smb-status/components/smb-notification-list/smb-notification-list.component'; describe('SmbNotificationListComponent', () => { @@ -34,7 +33,6 @@ describe('SmbNotificationListComponent', () => { const createComponent = createComponentFactory({ component: SmbNotificationListComponent, imports: [ - AppLoaderModule, SearchInput1Component, IxTableColumnsSelectorComponent, ], diff --git a/src/app/pages/sharing/smb/smb-status/components/smb-session-list/smb-session-list.component.spec.ts b/src/app/pages/sharing/smb/smb-status/components/smb-session-list/smb-session-list.component.spec.ts index 35ece04df7c..b123243655c 100644 --- a/src/app/pages/sharing/smb/smb-status/components/smb-session-list/smb-session-list.component.spec.ts +++ b/src/app/pages/sharing/smb/smb-status/components/smb-session-list/smb-session-list.component.spec.ts @@ -10,7 +10,6 @@ import { IxTableHarness } from 'app/modules/ix-table/components/ix-table/ix-tabl import { IxTableColumnsSelectorComponent, } from 'app/modules/ix-table/components/ix-table-columns-selector/ix-table-columns-selector.component'; -import { AppLoaderModule } from 'app/modules/loader/app-loader.module'; import { SmbSessionListComponent } from './smb-session-list.component'; describe('SmbSessionListComponent', () => { @@ -48,7 +47,6 @@ describe('SmbSessionListComponent', () => { const createComponent = createComponentFactory({ component: SmbSessionListComponent, imports: [ - AppLoaderModule, SearchInput1Component, IxTableColumnsSelectorComponent, ], diff --git a/src/app/pages/sharing/smb/smb-status/components/smb-share-list/smb-share-list.component.spec.ts b/src/app/pages/sharing/smb/smb-status/components/smb-share-list/smb-share-list.component.spec.ts index 1e941a21e3e..f7dfc358101 100644 --- a/src/app/pages/sharing/smb/smb-status/components/smb-share-list/smb-share-list.component.spec.ts +++ b/src/app/pages/sharing/smb/smb-status/components/smb-share-list/smb-share-list.component.spec.ts @@ -10,7 +10,6 @@ import { IxTableHarness } from 'app/modules/ix-table/components/ix-table/ix-tabl import { IxTableColumnsSelectorComponent, } from 'app/modules/ix-table/components/ix-table-columns-selector/ix-table-columns-selector.component'; -import { AppLoaderModule } from 'app/modules/loader/app-loader.module'; import { SmbShareListComponent } from './smb-share-list.component'; describe('SmbShareListComponent', () => { @@ -39,7 +38,6 @@ describe('SmbShareListComponent', () => { const createComponent = createComponentFactory({ component: SmbShareListComponent, imports: [ - AppLoaderModule, SearchInput1Component, IxTableColumnsSelectorComponent, ], diff --git a/src/app/pages/signin/set-admin-password-form/set-admin-password-form.component.ts b/src/app/pages/signin/set-admin-password-form/set-admin-password-form.component.ts index 027b29adf97..178c52e97e9 100644 --- a/src/app/pages/signin/set-admin-password-form/set-admin-password-form.component.ts +++ b/src/app/pages/signin/set-admin-password-form/set-admin-password-form.component.ts @@ -16,7 +16,7 @@ import { IxInputComponent } from 'app/modules/forms/ix-forms/components/ix-input import { IxRadioGroupComponent } from 'app/modules/forms/ix-forms/components/ix-radio-group/ix-radio-group.component'; import { FormErrorHandlerService } from 'app/modules/forms/ix-forms/services/form-error-handler.service'; import { matchOthersFgValidator } from 'app/modules/forms/ix-forms/validators/password-validation/password-validation'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestDirective } from 'app/modules/test-id/test.directive'; import { SigninStore } from 'app/pages/signin/store/signin.store'; import { AuthService } from 'app/services/auth/auth.service'; import { WebSocketService } from 'app/services/ws.service'; @@ -34,11 +34,11 @@ const adminUsername = 'truenas_admin'; FormsModule, ReactiveFormsModule, MatButton, - TestIdModule, AsyncPipe, TranslateModule, IxInputComponent, IxRadioGroupComponent, + TestDirective, ], }) export class SetAdminPasswordFormComponent { diff --git a/src/app/pages/signin/signin-form/signin-form.component.ts b/src/app/pages/signin/signin-form/signin-form.component.ts index 3828870affa..2c5115d4ed7 100644 --- a/src/app/pages/signin/signin-form/signin-form.component.ts +++ b/src/app/pages/signin/signin-form/signin-form.component.ts @@ -19,7 +19,7 @@ import { LoginResult } from 'app/enums/login-result.enum'; import { WINDOW } from 'app/helpers/window.helper'; import { IxInputComponent } from 'app/modules/forms/ix-forms/components/ix-input/ix-input.component'; import { FormErrorHandlerService } from 'app/modules/forms/ix-forms/services/form-error-handler.service'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestDirective } from 'app/modules/test-id/test.directive'; import { InsecureConnectionComponent } from 'app/pages/signin/insecure-connection/insecure-connection.component'; import { SigninStore } from 'app/pages/signin/store/signin.store'; import { AuthService } from 'app/services/auth/auth.service'; @@ -37,11 +37,11 @@ import { WebSocketService } from 'app/services/ws.service'; ReactiveFormsModule, InsecureConnectionComponent, MatButton, - TestIdModule, AsyncPipe, TranslateModule, IxInputComponent, AutofocusDirective, + TestDirective, ], }) export class SigninFormComponent implements OnInit { diff --git a/src/app/pages/signin/signin.component.ts b/src/app/pages/signin/signin.component.ts index 00ba3b0d488..5d0b7a58405 100644 --- a/src/app/pages/signin/signin.component.ts +++ b/src/app/pages/signin/signin.component.ts @@ -19,7 +19,7 @@ import { WINDOW } from 'app/helpers/window.helper'; import { DialogService } from 'app/modules/dialog/dialog.service'; import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; import { CopyrightLineComponent } from 'app/modules/layout/copyright-line/copyright-line.component'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestDirective } from 'app/modules/test-id/test.directive'; import { DisconnectedMessageComponent } from 'app/pages/signin/disconnected-message/disconnected-message.component'; import { FailoverStatusComponent } from 'app/pages/signin/failover-status/failover-status.component'; import { SetAdminPasswordFormComponent } from 'app/pages/signin/set-admin-password-form/set-admin-password-form.component'; @@ -41,7 +41,6 @@ import { WebSocketConnectionService } from 'app/services/websocket-connection.se MatFormField, MatInput, MatProgressSpinner, - TestIdModule, MatProgressBar, MatCard, MatCardContent, @@ -54,6 +53,7 @@ import { WebSocketConnectionService } from 'app/services/websocket-connection.se AsyncPipe, TranslateModule, CopyrightLineComponent, + TestDirective, ], providers: [SigninStore], }) diff --git a/src/app/pages/storage/components/dashboard-pool/export-disconnect-modal/export-disconnect-modal.component.spec.ts b/src/app/pages/storage/components/dashboard-pool/export-disconnect-modal/export-disconnect-modal.component.spec.ts index c8102dd784a..a51366d6fd9 100644 --- a/src/app/pages/storage/components/dashboard-pool/export-disconnect-modal/export-disconnect-modal.component.spec.ts +++ b/src/app/pages/storage/components/dashboard-pool/export-disconnect-modal/export-disconnect-modal.component.spec.ts @@ -18,7 +18,6 @@ import { Process } from 'app/interfaces/process.interface'; import { SystemDatasetConfig } from 'app/interfaces/system-dataset-config.interface'; import { DialogService } from 'app/modules/dialog/dialog.service'; import { IxFormHarness } from 'app/modules/forms/ix-forms/testing/ix-form.harness'; -import { AppLoaderModule } from 'app/modules/loader/app-loader.module'; import { SnackbarService } from 'app/modules/snackbar/services/snackbar.service'; import { WebSocketService } from 'app/services/ws.service'; import { ExportDisconnectModalComponent } from './export-disconnect-modal.component'; @@ -66,7 +65,6 @@ describe('ExportDisconnectModalComponent', () => { component: ExportDisconnectModalComponent, imports: [ ReactiveFormsModule, - AppLoaderModule, ], providers: [ mockWebSocket([ diff --git a/src/app/pages/storage/components/dashboard-pool/zfs-health-card/autotrim-dialog/autotrim-dialog.component.spec.ts b/src/app/pages/storage/components/dashboard-pool/zfs-health-card/autotrim-dialog/autotrim-dialog.component.spec.ts index 0f07188d7a9..3818c6074f0 100644 --- a/src/app/pages/storage/components/dashboard-pool/zfs-health-card/autotrim-dialog/autotrim-dialog.component.spec.ts +++ b/src/app/pages/storage/components/dashboard-pool/zfs-health-card/autotrim-dialog/autotrim-dialog.component.spec.ts @@ -11,7 +11,6 @@ import { OnOff } from 'app/enums/on-off.enum'; import { Pool } from 'app/interfaces/pool.interface'; import { DialogService } from 'app/modules/dialog/dialog.service'; import { IxCheckboxHarness } from 'app/modules/forms/ix-forms/components/ix-checkbox/ix-checkbox.harness'; -import { AppLoaderModule } from 'app/modules/loader/app-loader.module'; import { SnackbarService } from 'app/modules/snackbar/services/snackbar.service'; import { AutotrimDialogComponent, @@ -24,7 +23,6 @@ describe('AutotrimDialogComponent', () => { const createComponent = createComponentFactory({ component: AutotrimDialogComponent, imports: [ - AppLoaderModule, ReactiveFormsModule, ], providers: [ diff --git a/src/app/pages/storage/modules/devices/components/hardware-disk-encryption/manage-disk-sed-dialog/manage-disk-sed-dialog.component.spec.ts b/src/app/pages/storage/modules/devices/components/hardware-disk-encryption/manage-disk-sed-dialog/manage-disk-sed-dialog.component.spec.ts index 6e4132534ce..6b50d7b9b3a 100644 --- a/src/app/pages/storage/modules/devices/components/hardware-disk-encryption/manage-disk-sed-dialog/manage-disk-sed-dialog.component.spec.ts +++ b/src/app/pages/storage/modules/devices/components/hardware-disk-encryption/manage-disk-sed-dialog/manage-disk-sed-dialog.component.spec.ts @@ -9,7 +9,6 @@ import { mockCall, mockWebSocket } from 'app/core/testing/utils/mock-websocket.u import { Disk } from 'app/interfaces/disk.interface'; import { DialogService } from 'app/modules/dialog/dialog.service'; import { IxInputHarness } from 'app/modules/forms/ix-forms/components/ix-input/ix-input.harness'; -import { AppLoaderModule } from 'app/modules/loader/app-loader.module'; import { SnackbarService } from 'app/modules/snackbar/services/snackbar.service'; import { WebSocketService } from 'app/services/ws.service'; import { ManageDiskSedDialogComponent } from './manage-disk-sed-dialog.component'; @@ -22,7 +21,6 @@ describe('ManageDiskSedDialogComponent', () => { component: ManageDiskSedDialogComponent, imports: [ ReactiveFormsModule, - AppLoaderModule, ], providers: [ mockAuth(), diff --git a/src/app/pages/storage/modules/devices/devices.module.ts b/src/app/pages/storage/modules/devices/devices.module.ts index b3b9793e41e..58b552d3cdc 100644 --- a/src/app/pages/storage/modules/devices/devices.module.ts +++ b/src/app/pages/storage/modules/devices/devices.module.ts @@ -23,12 +23,15 @@ import { IxInputComponent } from 'app/modules/forms/ix-forms/components/ix-input import { SearchInput1Component } from 'app/modules/forms/search-input1/search-input1.component'; import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; import { TreeModule } from 'app/modules/ix-tree/tree.module'; -import { AppLoaderModule } from 'app/modules/loader/app-loader.module'; +import { FakeProgressBarComponent } from 'app/modules/loader/components/fake-progress-bar/fake-progress-bar.component'; +import { + WithLoadingStateDirective, +} from 'app/modules/loader/directives/with-loading-state/with-loading-state.directive'; import { PageHeaderModule } from 'app/modules/page-header/page-header.module'; import { CastPipe } from 'app/modules/pipes/cast/cast.pipe'; import { FileSizePipe } from 'app/modules/pipes/file-size/file-size.pipe'; import { OrNotAvailablePipe } from 'app/modules/pipes/or-not-available/or-not-available.pipe'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestDirective } from 'app/modules/test-id/test.directive'; import { DevicesComponent } from 'app/pages/storage/modules/devices/components/devices/devices.component'; import { DiskDetailsPanelComponent, @@ -72,8 +75,6 @@ import { ExtendDialogComponent } from './components/zfs-info-card/extend-dialog/ ReactiveFormsModule, RouterModule.forChild(routes), TranslateModule, - AppLoaderModule, - TestIdModule, MatTooltipModule, SearchInput1Component, UnusedDiskSelectComponent, @@ -94,6 +95,19 @@ import { ExtendDialogComponent } from './components/zfs-info-card/extend-dialog/ HasRoleDirective, RequiresRolesDirective, LetDirective, + FakeProgressBarComponent, + TestDirective, + TestDirective, + TestDirective, + WithLoadingStateDirective, + WithLoadingStateDirective, + TestDirective, + TestDirective, + TestDirective, + TestDirective, + WithLoadingStateDirective, + TestDirective, + WithLoadingStateDirective, ], declarations: [ DevicesComponent, diff --git a/src/app/pages/storage/modules/disks/components/smart-test-result-list/smart-test-result-list.component.spec.ts b/src/app/pages/storage/modules/disks/components/smart-test-result-list/smart-test-result-list.component.spec.ts index 60caf8c027a..e8721f899db 100644 --- a/src/app/pages/storage/modules/disks/components/smart-test-result-list/smart-test-result-list.component.spec.ts +++ b/src/app/pages/storage/modules/disks/components/smart-test-result-list/smart-test-result-list.component.spec.ts @@ -13,7 +13,6 @@ import { IxTableHarness } from 'app/modules/ix-table/components/ix-table/ix-tabl import { IxTableColumnsSelectorComponent, } from 'app/modules/ix-table/components/ix-table-columns-selector/ix-table-columns-selector.component'; -import { AppLoaderModule } from 'app/modules/loader/app-loader.module'; import { PageHeaderModule } from 'app/modules/page-header/page-header.module'; import { SmartTestResultListComponent } from 'app/pages/storage/modules/disks/components/smart-test-result-list/smart-test-result-list.component'; @@ -93,7 +92,6 @@ describe('SmartTestResultListComponent', () => { const createComponent = createComponentFactory({ component: SmartTestResultListComponent, imports: [ - AppLoaderModule, MockModule(PageHeaderModule), SearchInput1Component, IxTableColumnsSelectorComponent, diff --git a/src/app/pages/storage/modules/disks/disks.module.ts b/src/app/pages/storage/modules/disks/disks.module.ts index e7a8aadcbe8..8ffc5575608 100644 --- a/src/app/pages/storage/modules/disks/disks.module.ts +++ b/src/app/pages/storage/modules/disks/disks.module.ts @@ -38,7 +38,7 @@ import { IxTableDetailsRowDirective } from 'app/modules/ix-table/directives/ix-t import { IxTableEmptyDirective } from 'app/modules/ix-table/directives/ix-table-empty.directive'; import { PageHeaderModule } from 'app/modules/page-header/page-header.module'; import { FormatDateTimePipe } from 'app/modules/pipes/format-date-time/format-datetime.pipe'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestDirective } from 'app/modules/test-id/test.directive'; import { DiskBulkEditComponent, } from 'app/pages/storage/modules/disks/components/disk-bulk-edit/disk-bulk-edit.component'; @@ -64,7 +64,6 @@ import { routes } from 'app/pages/storage/modules/disks/disks.routing'; MatCardModule, MatDividerModule, MatProgressBarModule, - TestIdModule, IxIconComponent, PageHeaderModule, SearchInput1Component, @@ -90,6 +89,14 @@ import { routes } from 'app/pages/storage/modules/disks/disks.routing'; IxTableDetailsRowComponent, IxTablePagerComponent, IxTableColumnsSelectorComponent, + TestDirective, + TestDirective, + TestDirective, + TestDirective, + TestDirective, + TestDirective, + TestDirective, + TestDirective, ], declarations: [ DiskBulkEditComponent, diff --git a/src/app/pages/storage/modules/pool-manager/pool-manager.module.ts b/src/app/pages/storage/modules/pool-manager/pool-manager.module.ts index 98a5d9a77ce..c31a6c70104 100644 --- a/src/app/pages/storage/modules/pool-manager/pool-manager.module.ts +++ b/src/app/pages/storage/modules/pool-manager/pool-manager.module.ts @@ -28,11 +28,12 @@ import { IxSelectComponent } from 'app/modules/forms/ix-forms/components/ix-sele import { IxWarningComponent } from 'app/modules/forms/ix-forms/components/ix-warning/ix-warning.component'; import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; import { TreeModule } from 'app/modules/ix-tree/tree.module'; -import { AppLoaderModule } from 'app/modules/loader/app-loader.module'; +import { FakeProgressBarComponent } from 'app/modules/loader/components/fake-progress-bar/fake-progress-bar.component'; import { CastPipe } from 'app/modules/pipes/cast/cast.pipe'; import { FileSizePipe } from 'app/modules/pipes/file-size/file-size.pipe'; import { MapValuePipe } from 'app/modules/pipes/map-value/map-value.pipe'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestOverrideDirective } from 'app/modules/test-id/test-override/test-override.directive'; +import { TestDirective } from 'app/modules/test-id/test.directive'; import { AddVdevsComponent } from 'app/pages/storage/modules/pool-manager/components/add-vdevs/add-vdevs.component'; import { AddVdevsStore } from 'app/pages/storage/modules/pool-manager/components/add-vdevs/store/add-vdevs-store.service'; import { ConfigurationPreviewComponent } from 'app/pages/storage/modules/pool-manager/components/configuration-preview/configuration-preview.component'; @@ -90,8 +91,6 @@ import { DataWizardStepComponent } from './components/pool-manager-wizard/steps/ DndModule, RouterModule.forChild(routes), TranslateModule, - TestIdModule, - AppLoaderModule, NgxSkeletonLoaderModule, MatCheckboxModule, MatListModule, @@ -112,6 +111,13 @@ import { DataWizardStepComponent } from './components/pool-manager-wizard/steps/ NgClass, RequiresRolesDirective, StepActivationDirective, + FakeProgressBarComponent, + TestDirective, + TestOverrideDirective, + TestOverrideDirective, + TestOverrideDirective, + TestOverrideDirective, + TestOverrideDirective, ], declarations: [ PoolManagerComponent, diff --git a/src/app/pages/storage/storage.module.ts b/src/app/pages/storage/storage.module.ts index 1b30e6fc6a3..cc66a41dce1 100644 --- a/src/app/pages/storage/storage.module.ts +++ b/src/app/pages/storage/storage.module.ts @@ -37,12 +37,14 @@ import { } from 'app/modules/forms/ix-forms/components/ix-slide-in/components/ix-modal-header/ix-modal-header.component'; import { IxWarningComponent } from 'app/modules/forms/ix-forms/components/ix-warning/ix-warning.component'; import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component'; -import { AppLoaderModule } from 'app/modules/loader/app-loader.module'; +import { + WithLoadingStateDirective, +} from 'app/modules/loader/directives/with-loading-state/with-loading-state.directive'; import { PageHeaderModule } from 'app/modules/page-header/page-header.module'; import { FileSizePipe } from 'app/modules/pipes/file-size/file-size.pipe'; import { FormatDateTimePipe } from 'app/modules/pipes/format-date-time/format-datetime.pipe'; import { MapValuePipe } from 'app/modules/pipes/map-value/map-value.pipe'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestDirective } from 'app/modules/test-id/test.directive'; import { PoolCardIconComponent } from 'app/pages/storage/components/dashboard-pool/pool-card-icon/pool-card-icon.component'; import { GaugeChartComponent } from 'app/pages/storage/components/dashboard-pool/pool-usage-card/gauge-chart/gauge-chart.component'; import { PoolUsageCardComponent } from 'app/pages/storage/components/dashboard-pool/pool-usage-card/pool-usage-card.component'; @@ -89,8 +91,6 @@ import { ZfsHealthCardComponent } from './components/dashboard-pool/zfs-health-c MatProgressBarModule, NgxSkeletonLoaderModule, EntityModule, - TestIdModule, - AppLoaderModule, EmptyComponent, FileSizePipe, FormatDateTimePipe, @@ -109,6 +109,29 @@ import { ZfsHealthCardComponent } from './components/dashboard-pool/zfs-health-c PercentPipe, RequiresRolesDirective, UiSearchDirective, + TestDirective, + TestDirective, + TestDirective, + TestDirective, + TestDirective, + TestDirective, + TestDirective, + TestDirective, + TestDirective, + WithLoadingStateDirective, + TestDirective, + TestDirective, + TestDirective, + TestDirective, + TestDirective, + TestDirective, + TestDirective, + TestDirective, + TestDirective, + TestDirective, + TestDirective, + TestDirective, + TestDirective, ], declarations: [ PoolsDashboardComponent, diff --git a/src/app/pages/system/advanced/access/access-card/access-card.component.spec.ts b/src/app/pages/system/advanced/access/access-card/access-card.component.spec.ts index 3e15118ab0d..61025889700 100644 --- a/src/app/pages/system/advanced/access/access-card/access-card.component.spec.ts +++ b/src/app/pages/system/advanced/access/access-card/access-card.component.spec.ts @@ -16,7 +16,6 @@ import { IxTableHarness } from 'app/modules/ix-table/components/ix-table/ix-tabl import { IxTablePagerShowMoreComponent, } from 'app/modules/ix-table/components/ix-table-pager-show-more/ix-table-pager-show-more.component'; -import { AppLoaderModule } from 'app/modules/loader/app-loader.module'; import { YesNoPipe } from 'app/modules/pipes/yes-no/yes-no.pipe'; import { AccessCardComponent } from 'app/pages/system/advanced/access/access-card/access-card.component'; import { AccessFormComponent } from 'app/pages/system/advanced/access/access-form/access-form.component'; @@ -53,7 +52,6 @@ describe('AccessCardComponent', () => { const createComponent = createComponentFactory({ component: AccessCardComponent, imports: [ - AppLoaderModule, FakeFormatDateTimePipe, YesNoPipe, IxTablePagerShowMoreComponent, diff --git a/src/app/pages/system/advanced/cron/cron-card/cron-card.component.spec.ts b/src/app/pages/system/advanced/cron/cron-card/cron-card.component.spec.ts index 13fa1d75bd2..1817f0aeafe 100644 --- a/src/app/pages/system/advanced/cron/cron-card/cron-card.component.spec.ts +++ b/src/app/pages/system/advanced/cron/cron-card/cron-card.component.spec.ts @@ -11,7 +11,6 @@ import { DialogService } from 'app/modules/dialog/dialog.service'; import { ChainedRef } from 'app/modules/forms/ix-forms/components/ix-slide-in/chained-component-ref'; import { IxIconHarness } from 'app/modules/ix-icon/ix-icon.harness'; import { IxTableHarness } from 'app/modules/ix-table/components/ix-table/ix-table.harness'; -import { AppLoaderModule } from 'app/modules/loader/app-loader.module'; import { AdvancedSettingsService } from 'app/pages/system/advanced/advanced-settings.service'; import { CronCardComponent } from 'app/pages/system/advanced/cron/cron-card/cron-card.component'; import { CronDeleteDialogComponent } from 'app/pages/system/advanced/cron/cron-delete-dialog/cron-delete-dialog.component'; @@ -49,7 +48,6 @@ describe('CronCardComponent', () => { const createComponent = createComponentFactory({ component: CronCardComponent, imports: [ - AppLoaderModule, ], providers: [ provideMockStore({ diff --git a/src/app/pages/system/advanced/cron/cron-list/cron-list.component.spec.ts b/src/app/pages/system/advanced/cron/cron-list/cron-list.component.spec.ts index c200148c1e9..c02a9be14be 100644 --- a/src/app/pages/system/advanced/cron/cron-list/cron-list.component.spec.ts +++ b/src/app/pages/system/advanced/cron/cron-list/cron-list.component.spec.ts @@ -20,7 +20,6 @@ import { IxTableDetailsRowComponent, } from 'app/modules/ix-table/components/ix-table-details-row/ix-table-details-row.component'; import { IxTableDetailsRowDirective } from 'app/modules/ix-table/directives/ix-table-details-row.directive'; -import { AppLoaderModule } from 'app/modules/loader/app-loader.module'; import { PageHeaderModule } from 'app/modules/page-header/page-header.module'; import { CronDeleteDialogComponent } from 'app/pages/system/advanced/cron/cron-delete-dialog/cron-delete-dialog.component'; import { CronFormComponent } from 'app/pages/system/advanced/cron/cron-form/cron-form.component'; @@ -58,7 +57,6 @@ describe('CronListComponent', () => { const createComponent = createComponentFactory({ component: CronListComponent, imports: [ - AppLoaderModule, MockModule(PageHeaderModule), SearchInput1Component, IxTableColumnsSelectorComponent, diff --git a/src/app/pages/system/advanced/init-shutdown/init-shutdown-card/init-shutdown-card.component.spec.ts b/src/app/pages/system/advanced/init-shutdown/init-shutdown-card/init-shutdown-card.component.spec.ts index a943db4b8bc..a64b070d3ca 100644 --- a/src/app/pages/system/advanced/init-shutdown/init-shutdown-card/init-shutdown-card.component.spec.ts +++ b/src/app/pages/system/advanced/init-shutdown/init-shutdown-card/init-shutdown-card.component.spec.ts @@ -12,7 +12,6 @@ import { DialogService } from 'app/modules/dialog/dialog.service'; import { ChainedRef } from 'app/modules/forms/ix-forms/components/ix-slide-in/chained-component-ref'; import { IxIconHarness } from 'app/modules/ix-icon/ix-icon.harness'; import { IxTableHarness } from 'app/modules/ix-table/components/ix-table/ix-table.harness'; -import { AppLoaderModule } from 'app/modules/loader/app-loader.module'; import { AdvancedSettingsService } from 'app/pages/system/advanced/advanced-settings.service'; import { InitShutdownCardComponent, @@ -53,7 +52,6 @@ describe('InitShutdownCardComponent', () => { const createComponent = createComponentFactory({ component: InitShutdownCardComponent, imports: [ - AppLoaderModule, ], providers: [ mockWebSocket([ diff --git a/src/app/pages/system/advanced/sysctl/sysctl-card/sysctl-card.component.spec.ts b/src/app/pages/system/advanced/sysctl/sysctl-card/sysctl-card.component.spec.ts index 715917dbc89..40fa3d1aa89 100644 --- a/src/app/pages/system/advanced/sysctl/sysctl-card/sysctl-card.component.spec.ts +++ b/src/app/pages/system/advanced/sysctl/sysctl-card/sysctl-card.component.spec.ts @@ -11,7 +11,6 @@ import { DialogService } from 'app/modules/dialog/dialog.service'; import { ChainedRef } from 'app/modules/forms/ix-forms/components/ix-slide-in/chained-component-ref'; import { IxIconHarness } from 'app/modules/ix-icon/ix-icon.harness'; import { IxTableHarness } from 'app/modules/ix-table/components/ix-table/ix-table.harness'; -import { AppLoaderModule } from 'app/modules/loader/app-loader.module'; import { AdvancedSettingsService } from 'app/pages/system/advanced/advanced-settings.service'; import { TunableFormComponent } from 'app/pages/system/advanced/sysctl/tunable-form/tunable-form.component'; import { IxChainedSlideInService } from 'app/services/ix-chained-slide-in.service'; @@ -43,7 +42,6 @@ describe('SysctlCardComponent', () => { const createComponent = createComponentFactory({ component: SysctlCardComponent, imports: [ - AppLoaderModule, ], providers: [ mockWebSocket([ diff --git a/src/app/pages/system/bootenv/boot-pool-delete-dialog/boot-pool-delete-dialog.component.spec.ts b/src/app/pages/system/bootenv/boot-pool-delete-dialog/boot-pool-delete-dialog.component.spec.ts index 92b4e1e6138..717e9829246 100644 --- a/src/app/pages/system/bootenv/boot-pool-delete-dialog/boot-pool-delete-dialog.component.spec.ts +++ b/src/app/pages/system/bootenv/boot-pool-delete-dialog/boot-pool-delete-dialog.component.spec.ts @@ -12,7 +12,6 @@ import { CoreBulkQuery, CoreBulkResponse } from 'app/interfaces/core-bulk.interf import { DialogService } from 'app/modules/dialog/dialog.service'; import { IxFormHarness } from 'app/modules/forms/ix-forms/testing/ix-form.harness'; import { BulkListItemComponent } from 'app/modules/lists/bulk-list-item/bulk-list-item.component'; -import { AppLoaderModule } from 'app/modules/loader/app-loader.module'; import { AppLoaderService } from 'app/modules/loader/app-loader.service'; import { BootPoolDeleteDialogComponent } from 'app/pages/system/bootenv/boot-pool-delete-dialog/boot-pool-delete-dialog.component'; import { fakeBootEnvironmentsDataSource } from 'app/pages/system/bootenv/test/fake-boot-environments'; @@ -41,7 +40,6 @@ describe('BootPoolDeleteDialogComponent', () => { const createComponent = createComponentFactory({ component: BootPoolDeleteDialogComponent, imports: [ - AppLoaderModule, ReactiveFormsModule, BulkListItemComponent, ], diff --git a/src/app/pages/system/bootenv/bootenv-list/bootenv-list.component.spec.ts b/src/app/pages/system/bootenv/bootenv-list/bootenv-list.component.spec.ts index 6c47ce53bf5..b1e2e6c8c4c 100644 --- a/src/app/pages/system/bootenv/bootenv-list/bootenv-list.component.spec.ts +++ b/src/app/pages/system/bootenv/bootenv-list/bootenv-list.component.spec.ts @@ -10,7 +10,6 @@ import { mockCall, mockWebSocket } from 'app/core/testing/utils/mock-websocket.u import { DialogService } from 'app/modules/dialog/dialog.service'; import { SearchInput1Component } from 'app/modules/forms/search-input1/search-input1.component'; import { IxTableHarness } from 'app/modules/ix-table/components/ix-table/ix-table.harness'; -import { AppLoaderModule } from 'app/modules/loader/app-loader.module'; import { PageHeaderModule } from 'app/modules/page-header/page-header.module'; import { BootEnvironmentListComponent } from 'app/pages/system/bootenv/bootenv-list/bootenv-list.component'; import { fakeBootEnvironmentsDataSource } from 'app/pages/system/bootenv/test/fake-boot-environments'; @@ -27,7 +26,6 @@ describe('BootEnvironmentListComponent', () => { const createComponent = createComponentFactory({ component: BootEnvironmentListComponent, imports: [ - AppLoaderModule, MockModule(PageHeaderModule), SearchInput1Component, ], diff --git a/src/app/pages/system/bootenv/bootenv-stats-dialog/bootenv-stats-dialog.component.spec.ts b/src/app/pages/system/bootenv/bootenv-stats-dialog/bootenv-stats-dialog.component.spec.ts index dd977cdabe7..60e5aac9b8d 100644 --- a/src/app/pages/system/bootenv/bootenv-stats-dialog/bootenv-stats-dialog.component.spec.ts +++ b/src/app/pages/system/bootenv/bootenv-stats-dialog/bootenv-stats-dialog.component.spec.ts @@ -14,7 +14,6 @@ import { AdvancedConfig } from 'app/interfaces/advanced-config.interface'; import { PoolInstance } from 'app/interfaces/pool.interface'; import { DialogService } from 'app/modules/dialog/dialog.service'; import { IxFormHarness } from 'app/modules/forms/ix-forms/testing/ix-form.harness'; -import { AppLoaderModule } from 'app/modules/loader/app-loader.module'; import { FileSizePipe } from 'app/modules/pipes/file-size/file-size.pipe'; import { MapValuePipe } from 'app/modules/pipes/map-value/map-value.pipe'; import { SnackbarService } from 'app/modules/snackbar/services/snackbar.service'; @@ -40,7 +39,6 @@ describe('BootenvStatsDialogComponent', () => { const createComponent = createComponentFactory({ component: BootenvStatsDialogComponent, imports: [ - AppLoaderModule, ReactiveFormsModule, MapValuePipe, FileSizePipe, diff --git a/src/app/pages/system/bootenv/bootenv-status/bootenv-status.component.spec.ts b/src/app/pages/system/bootenv/bootenv-status/bootenv-status.component.spec.ts index 3573327e131..79dc9a94885 100644 --- a/src/app/pages/system/bootenv/bootenv-status/bootenv-status.component.spec.ts +++ b/src/app/pages/system/bootenv/bootenv-status/bootenv-status.component.spec.ts @@ -14,7 +14,6 @@ import { TopologyItem } from 'app/interfaces/storage.interface'; import { DialogService } from 'app/modules/dialog/dialog.service'; import { TreeHarness } from 'app/modules/ix-tree/testing/tree.harness'; import { TreeModule } from 'app/modules/ix-tree/tree.module'; -import { AppLoaderModule } from 'app/modules/loader/app-loader.module'; import { SnackbarService } from 'app/modules/snackbar/services/snackbar.service'; import { BootStatusListComponent } from 'app/pages/system/bootenv/bootenv-status/bootenv-status.component'; import { BootenvNodeItemComponent } from './bootenv-node-item/bootenv-node-item.component'; @@ -64,7 +63,6 @@ describe('BootStatusListComponent', () => { const createComponent = createComponentFactory({ component: BootStatusListComponent, imports: [ - AppLoaderModule, TreeModule, ], providers: [ diff --git a/src/app/pages/system/enclosure/enclosure.module.ts b/src/app/pages/system/enclosure/enclosure.module.ts index 4b9d4438157..93e5a332ae9 100644 --- a/src/app/pages/system/enclosure/enclosure.module.ts +++ b/src/app/pages/system/enclosure/enclosure.module.ts @@ -26,12 +26,12 @@ import { IxTableBodyComponent } from 'app/modules/ix-table/components/ix-table-b import { IxTableHeadComponent } from 'app/modules/ix-table/components/ix-table-head/ix-table-head.component'; import { IxTablePagerComponent } from 'app/modules/ix-table/components/ix-table-pager/ix-table-pager.component'; import { IxTableEmptyDirective } from 'app/modules/ix-table/directives/ix-table-empty.directive'; -import { AppLoaderModule } from 'app/modules/loader/app-loader.module'; +import { FakeProgressBarComponent } from 'app/modules/loader/components/fake-progress-bar/fake-progress-bar.component'; import { PageHeaderModule } from 'app/modules/page-header/page-header.module'; import { FileSizePipe } from 'app/modules/pipes/file-size/file-size.pipe'; import { MapValuePipe } from 'app/modules/pipes/map-value/map-value.pipe'; import { OrNotAvailablePipe } from 'app/modules/pipes/or-not-available/or-not-available.pipe'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestDirective } from 'app/modules/test-id/test.directive'; import { TooltipComponent } from 'app/modules/tooltip/tooltip.component'; import { EnclosureDashboardComponent } from 'app/pages/system/enclosure/components/enclosure-dashboard/enclosure-dashboard.component'; import { @@ -114,7 +114,6 @@ import { SvgCacheService } from 'app/pages/system/enclosure/services/svg-cache.s @NgModule({ imports: [ routing, - TestIdModule, MatCardModule, MatButtonModule, TranslateModule, @@ -131,7 +130,6 @@ import { SvgCacheService } from 'app/pages/system/enclosure/services/svg-cache.s FileSizePipe, MapValuePipe, NgxSkeletonLoaderModule, - AppLoaderModule, DiskIconComponent, TooltipComponent, OrNotAvailablePipe, @@ -150,6 +148,12 @@ import { SvgCacheService } from 'app/pages/system/enclosure/services/svg-cache.s IxTableBodyComponent, IxTableEmptyDirective, IxTablePagerComponent, + FakeProgressBarComponent, + TestDirective, + TestDirective, + TestDirective, + TestDirective, + TestDirective, ], declarations: [ EnclosureDashboardComponent, diff --git a/src/app/pages/system/general-settings/gui/gui-form/gui-form.component.spec.ts b/src/app/pages/system/general-settings/gui/gui-form/gui-form.component.spec.ts index e684e96a745..0abe14e5de3 100644 --- a/src/app/pages/system/general-settings/gui/gui-form/gui-form.component.spec.ts +++ b/src/app/pages/system/general-settings/gui/gui-form/gui-form.component.spec.ts @@ -18,7 +18,6 @@ import { } from 'app/modules/forms/ix-forms/components/with-manage-certificates-link/with-manage-certificates-link.component'; import { FormErrorHandlerService } from 'app/modules/forms/ix-forms/services/form-error-handler.service'; import { IxFormHarness } from 'app/modules/forms/ix-forms/testing/ix-form.harness'; -import { AppLoaderModule } from 'app/modules/loader/app-loader.module'; import { GuiFormComponent } from 'app/pages/system/general-settings/gui/gui-form/gui-form.component'; import { SystemGeneralService } from 'app/services/system-general.service'; import { ThemeService } from 'app/services/theme/theme.service'; @@ -58,7 +57,6 @@ describe('GuiFormComponent', () => { component: GuiFormComponent, imports: [ ReactiveFormsModule, - AppLoaderModule, WithManageCertificatesLinkComponent, ], providers: [ diff --git a/src/app/pages/system/general-settings/save-config-dialog/save-config-dialog.component.spec.ts b/src/app/pages/system/general-settings/save-config-dialog/save-config-dialog.component.spec.ts index e53eb65e17e..5b7b0eb2781 100644 --- a/src/app/pages/system/general-settings/save-config-dialog/save-config-dialog.component.spec.ts +++ b/src/app/pages/system/general-settings/save-config-dialog/save-config-dialog.component.spec.ts @@ -12,7 +12,6 @@ import { mockCall, mockWebSocket } from 'app/core/testing/utils/mock-websocket.u import { SystemInfo } from 'app/interfaces/system-info.interface'; import { DialogService } from 'app/modules/dialog/dialog.service'; import { IxCheckboxHarness } from 'app/modules/forms/ix-forms/components/ix-checkbox/ix-checkbox.harness'; -import { AppLoaderModule } from 'app/modules/loader/app-loader.module'; import { SaveConfigDialogComponent, } from 'app/pages/system/general-settings/save-config-dialog/save-config-dialog.component'; @@ -27,7 +26,6 @@ describe('SaveConfigDialogComponent', () => { component: SaveConfigDialogComponent, imports: [ ReactiveFormsModule, - AppLoaderModule, ], providers: [ mockAuth(), diff --git a/src/app/pages/system/general-settings/upload-config-dialog/upload-config-dialog.component.spec.ts b/src/app/pages/system/general-settings/upload-config-dialog/upload-config-dialog.component.spec.ts index 6e4ab392ece..39cd9674b15 100644 --- a/src/app/pages/system/general-settings/upload-config-dialog/upload-config-dialog.component.spec.ts +++ b/src/app/pages/system/general-settings/upload-config-dialog/upload-config-dialog.component.spec.ts @@ -8,7 +8,6 @@ import { fakeFile } from 'app/core/testing/utils/fake-file.uitls'; import { fakeSuccessfulJob } from 'app/core/testing/utils/fake-job.utils'; import { DialogService } from 'app/modules/dialog/dialog.service'; import { IxFileInputHarness } from 'app/modules/forms/ix-forms/components/ix-file-input/ix-file-input.harness'; -import { AppLoaderModule } from 'app/modules/loader/app-loader.module'; import { AuthService } from 'app/services/auth/auth.service'; import { UploadService } from 'app/services/upload.service'; import { UploadConfigDialogComponent } from './upload-config-dialog.component'; @@ -19,7 +18,6 @@ describe('UploadConfigDialogComponent', () => { component: UploadConfigDialogComponent, imports: [ ReactiveFormsModule, - AppLoaderModule, ], providers: [ mockProvider(Router), diff --git a/src/app/pages/system/system.module.ts b/src/app/pages/system/system.module.ts index a9a27df920a..cedcb67a9fa 100644 --- a/src/app/pages/system/system.module.ts +++ b/src/app/pages/system/system.module.ts @@ -69,9 +69,11 @@ import { import { IxTableDetailsRowDirective } from 'app/modules/ix-table/directives/ix-table-details-row.directive'; import { IxTableEmptyDirective } from 'app/modules/ix-table/directives/ix-table-empty.directive'; import { TreeModule } from 'app/modules/ix-tree/tree.module'; -import { JobsModule } from 'app/modules/jobs/jobs.module'; import { BulkListItemComponent } from 'app/modules/lists/bulk-list-item/bulk-list-item.component'; -import { AppLoaderModule } from 'app/modules/loader/app-loader.module'; +import { FakeProgressBarComponent } from 'app/modules/loader/components/fake-progress-bar/fake-progress-bar.component'; +import { + WithLoadingStateDirective, +} from 'app/modules/loader/directives/with-loading-state/with-loading-state.directive'; import { PageHeaderModule } from 'app/modules/page-header/page-header.module'; import { CastPipe } from 'app/modules/pipes/cast/cast.pipe'; import { FileSizePipe } from 'app/modules/pipes/file-size/file-size.pipe'; @@ -79,7 +81,8 @@ import { FormatDateTimePipe } from 'app/modules/pipes/format-date-time/format-da import { MapValuePipe } from 'app/modules/pipes/map-value/map-value.pipe'; import { YesNoPipe } from 'app/modules/pipes/yes-no/yes-no.pipe'; import { SchedulerModule } from 'app/modules/scheduler/scheduler.module'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestOverrideDirective } from 'app/modules/test-id/test-override/test-override.directive'; +import { TestDirective } from 'app/modules/test-id/test.directive'; import { TooltipComponent } from 'app/modules/tooltip/tooltip.component'; import { AccessCardComponent } from 'app/pages/system/advanced/access/access-card/access-card.component'; import { AccessFormComponent } from 'app/pages/system/advanced/access/access-form/access-form.component'; @@ -184,12 +187,10 @@ import { routing } from './system.routing'; @NgModule({ imports: [ - AppLoaderModule, EntityModule, FormsModule, TreeModule, SchedulerModule, - JobsModule, MatCardModule, IxIconComponent, MatSelectModule, @@ -208,8 +209,6 @@ import { routing } from './system.routing'; MatDialogModule, MatExpansionModule, MatSlideToggleModule, - AppLoaderModule, - TestIdModule, OauthButtonModule, UnusedDiskSelectComponent, SearchInput1Component, @@ -252,6 +251,61 @@ import { routing } from './system.routing'; IxTableDetailsRowComponent, IxTablePagerComponent, IxTableColumnsSelectorComponent, + FakeProgressBarComponent, + TestDirective, + WithLoadingStateDirective, + WithLoadingStateDirective, + WithLoadingStateDirective, + WithLoadingStateDirective, + WithLoadingStateDirective, + WithLoadingStateDirective, + WithLoadingStateDirective, + WithLoadingStateDirective, + WithLoadingStateDirective, + WithLoadingStateDirective, + WithLoadingStateDirective, + WithLoadingStateDirective, + WithLoadingStateDirective, + WithLoadingStateDirective, + WithLoadingStateDirective, + WithLoadingStateDirective, + WithLoadingStateDirective, + WithLoadingStateDirective, + WithLoadingStateDirective, + WithLoadingStateDirective, + WithLoadingStateDirective, + WithLoadingStateDirective, + WithLoadingStateDirective, + WithLoadingStateDirective, + WithLoadingStateDirective, + WithLoadingStateDirective, + WithLoadingStateDirective, + WithLoadingStateDirective, + WithLoadingStateDirective, + WithLoadingStateDirective, + WithLoadingStateDirective, + WithLoadingStateDirective, + WithLoadingStateDirective, + WithLoadingStateDirective, + WithLoadingStateDirective, + WithLoadingStateDirective, + WithLoadingStateDirective, + WithLoadingStateDirective, + WithLoadingStateDirective, + WithLoadingStateDirective, + WithLoadingStateDirective, + WithLoadingStateDirective, + WithLoadingStateDirective, + WithLoadingStateDirective, + WithLoadingStateDirective, + WithLoadingStateDirective, + WithLoadingStateDirective, + WithLoadingStateDirective, + WithLoadingStateDirective, + WithLoadingStateDirective, + WithLoadingStateDirective, + TestOverrideDirective, + TestOverrideDirective, ], declarations: [ AdvancedSettingsComponent, diff --git a/src/app/pages/two-factor-auth/two-factor-auth.module.ts b/src/app/pages/two-factor-auth/two-factor-auth.module.ts index be419dea31c..51349ca74a3 100644 --- a/src/app/pages/two-factor-auth/two-factor-auth.module.ts +++ b/src/app/pages/two-factor-auth/two-factor-auth.module.ts @@ -12,8 +12,7 @@ import { QrCodeModule } from 'ng-qrcode'; import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader'; import { UiSearchDirective } from 'app/directives/ui-search.directive'; import { IxWarningComponent } from 'app/modules/forms/ix-forms/components/ix-warning/ix-warning.component'; -import { AppLoaderModule } from 'app/modules/loader/app-loader.module'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestDirective } from 'app/modules/test-id/test.directive'; import { QrViewerComponent } from 'app/pages/two-factor-auth/components/two-factor/qr-viewer/qr-viewer.component'; import { TwoFactorComponent } from 'app/pages/two-factor-auth/components/two-factor/two-factor.component'; import { routing } from 'app/pages/two-factor-auth/two-factor-auth.routing'; @@ -21,7 +20,6 @@ import { routing } from 'app/pages/two-factor-auth/two-factor-auth.routing'; @NgModule({ imports: [ ReactiveFormsModule, - AppLoaderModule, MatCardModule, MatProgressBarModule, MatButtonModule, @@ -30,12 +28,12 @@ import { routing } from 'app/pages/two-factor-auth/two-factor-auth.routing'; NgxSkeletonLoaderModule, MatToolbarModule, TranslateModule, - TestIdModule, QrCodeModule, routing, IxWarningComponent, AsyncPipe, UiSearchDirective, + TestDirective, ], declarations: [ TwoFactorComponent, diff --git a/src/app/pages/vm/vm-list/vm-list.component.spec.ts b/src/app/pages/vm/vm-list/vm-list.component.spec.ts index f1e5b7e9bd3..87a955c4eef 100644 --- a/src/app/pages/vm/vm-list/vm-list.component.spec.ts +++ b/src/app/pages/vm/vm-list/vm-list.component.spec.ts @@ -15,7 +15,6 @@ import { IxTableColumnsSelectorComponent, } from 'app/modules/ix-table/components/ix-table-columns-selector/ix-table-columns-selector.component'; import { IxTableDetailsRowDirective } from 'app/modules/ix-table/directives/ix-table-details-row.directive'; -import { AppLoaderModule } from 'app/modules/loader/app-loader.module'; import { PageHeaderModule } from 'app/modules/page-header/page-header.module'; import { FileSizePipe } from 'app/modules/pipes/file-size/file-size.pipe'; import { VmWizardComponent } from 'app/pages/vm/vm-wizard/vm-wizard.component'; @@ -55,7 +54,6 @@ describe('VmListComponent', () => { const createComponent = createComponentFactory({ component: VmListComponent, imports: [ - AppLoaderModule, MockModule(PageHeaderModule), SearchInput1Component, IxTableColumnsSelectorComponent, diff --git a/src/app/pages/vm/vm.module.ts b/src/app/pages/vm/vm.module.ts index 9b37fd3be66..187f5ce15e9 100644 --- a/src/app/pages/vm/vm.module.ts +++ b/src/app/pages/vm/vm.module.ts @@ -43,12 +43,14 @@ import { IxTablePagerComponent } from 'app/modules/ix-table/components/ix-table- import { IxTableCellDirective } from 'app/modules/ix-table/directives/ix-table-cell.directive'; import { IxTableDetailsRowDirective } from 'app/modules/ix-table/directives/ix-table-details-row.directive'; import { IxTableEmptyDirective } from 'app/modules/ix-table/directives/ix-table-empty.directive'; -import { AppLoaderModule } from 'app/modules/loader/app-loader.module'; +import { + WithLoadingStateDirective, +} from 'app/modules/loader/directives/with-loading-state/with-loading-state.directive'; import { PageHeaderModule } from 'app/modules/page-header/page-header.module'; import { FileSizePipe } from 'app/modules/pipes/file-size/file-size.pipe'; import { SummaryComponent } from 'app/modules/summary/summary.component'; import { TerminalModule } from 'app/modules/terminal/terminal.module'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestDirective } from 'app/modules/test-id/test.directive'; import { DeviceFormComponent } from 'app/pages/vm/devices/device-form/device-form.component'; import { DeviceDeleteModalComponent } from 'app/pages/vm/devices/device-list/device-delete-modal/device-delete-modal.component'; import { VmEditFormComponent } from 'app/pages/vm/vm-edit-form/vm-edit-form.component'; @@ -72,7 +74,6 @@ import { routing } from './vm.routing'; @NgModule({ imports: [ - AppLoaderModule, EntityModule, IxIconComponent, MatButtonModule, @@ -87,7 +88,6 @@ import { routing } from './vm.routing'; ReactiveFormsModule, routing, TerminalModule, - TestIdModule, TranslateModule, SearchInput1Component, SummaryComponent, @@ -117,6 +117,8 @@ import { routing } from './vm.routing'; IxTableDetailsRowDirective, IxTableDetailsRowComponent, IxTableColumnsSelectorComponent, + TestDirective, + WithLoadingStateDirective, ], declarations: [ VmSerialShellComponent, diff --git a/src/app/services/vm.service.spec.ts b/src/app/services/vm.service.spec.ts index 5a7bdef6ebd..4ece31c7309 100644 --- a/src/app/services/vm.service.spec.ts +++ b/src/app/services/vm.service.spec.ts @@ -6,7 +6,6 @@ import { fakeSuccessfulJob } from 'app/core/testing/utils/fake-job.utils'; import { mockCall, mockJob, mockWebSocket } from 'app/core/testing/utils/mock-websocket.utils'; import { VirtualMachine } from 'app/interfaces/virtual-machine.interface'; import { DialogService } from 'app/modules/dialog/dialog.service'; -import { AppLoaderModule } from 'app/modules/loader/app-loader.module'; import { StopVmDialogComponent } from 'app/pages/vm/vm-list/stop-vm-dialog/stop-vm-dialog.component'; import { WebSocketService } from 'app/services/ws.service'; import { VmService } from './vm.service'; @@ -15,7 +14,6 @@ describe('VmService', () => { let spectator: SpectatorService; const createService = createServiceFactory({ service: VmService, - imports: [AppLoaderModule], providers: [ mockWebSocket([ mockCall('core.download'), diff --git a/src/app/store/index.ts b/src/app/store/index.ts index bb7227bcd79..a177cd10796 100644 --- a/src/app/store/index.ts +++ b/src/app/store/index.ts @@ -1,5 +1,8 @@ import { routerReducer, RouterReducerState } from '@ngrx/router-store'; import { ActionReducerMap } from '@ngrx/store'; +import { JobEffects } from 'app/modules/jobs/store/job.effects'; +import { jobReducer, JobsState } from 'app/modules/jobs/store/job.reducer'; +import { jobStateKey } from 'app/modules/jobs/store/job.selectors'; import { EulaEffects } from 'app/store/eula/eula.effects'; import { HaFipsEffects } from 'app/store/ha-fips/ha-fips.effects'; import { HaInfoEffects } from 'app/store/ha-info/ha-info.effects'; @@ -33,6 +36,7 @@ export interface AppsState { [haInfoStateKey]: HaInfoState; [servicesStateKey]: ServicesState; [networkInterfacesKey]: NetworkInterfacesState; + [jobStateKey]: JobsState; router: RouterReducerState; } @@ -43,6 +47,7 @@ export const rootReducers: ActionReducerMap = { [haInfoStateKey]: haInfoReducer, [servicesStateKey]: servicesReducer, [networkInterfacesKey]: networkInterfacesReducer, + [jobStateKey]: jobReducer, router: routerReducer, }; export const rootEffects = [ @@ -55,4 +60,5 @@ export const rootEffects = [ ServicesEffects, NetworkInterfacesEffects, HaFipsEffects, + JobEffects, ]; diff --git a/src/setup-jest.ts b/src/setup-jest.ts index c98085b7c8c..c59a89cabcf 100644 --- a/src/setup-jest.ts +++ b/src/setup-jest.ts @@ -78,10 +78,10 @@ import { IxTableBodyComponent } from 'app/modules/ix-table/components/ix-table-b import { IxTableHeadComponent } from 'app/modules/ix-table/components/ix-table-head/ix-table-head.component'; import { IxTablePagerComponent } from 'app/modules/ix-table/components/ix-table-pager/ix-table-pager.component'; import { IxTableEmptyDirective } from 'app/modules/ix-table/directives/ix-table-empty.directive'; -import { AppLoaderModule } from 'app/modules/loader/app-loader.module'; import { AppLoaderService } from 'app/modules/loader/app-loader.service'; import { SnackbarModule } from 'app/modules/snackbar/snackbar.module'; -import { TestIdModule } from 'app/modules/test-id/test-id.module'; +import { TestOverrideDirective } from 'app/modules/test-id/test-override/test-override.directive'; +import { TestDirective } from 'app/modules/test-id/test.directive'; import { AuthService } from 'app/services/auth/auth.service'; import { ErrorHandlerService } from 'app/services/error-handler.service'; import { WebSocketService } from 'app/services/ws.service'; @@ -136,7 +136,6 @@ defineGlobalsInjections({ FormActionsComponent, RouterModule.forRoot([]), SnackbarModule, - TestIdModule, UiSearchDirective, RequiresRolesDirective, IxTableComponent, @@ -144,6 +143,8 @@ defineGlobalsInjections({ IxTableEmptyDirective, IxTableHeadComponent, IxTableBodyComponent, + TestDirective, + TestOverrideDirective, TranslateModule.forRoot({ defaultLanguage: 'en', loader: { @@ -162,7 +163,6 @@ defineGlobalsInjections({ }), StoreModule.forRoot({}), EffectsModule.forRoot([]), - AppLoaderModule, ], providers: [ MockProvider(HighContrastModeDetector), diff --git a/tsconfig.strictNullChecks.json b/tsconfig.strictNullChecks.json index edec5f7362c..410763fe92b 100644 --- a/tsconfig.strictNullChecks.json +++ b/tsconfig.strictNullChecks.json @@ -546,9 +546,8 @@ "./src/app/modules/summary/summary.interface.ts", "./src/app/modules/terminal/components/copy-paste-message/copy-paste-message.component.ts", "./src/app/modules/terminal/xterm-attach-addon.ts", - "./src/app/modules/test-id/test-id.module.ts", "./src/app/modules/test-id/test-override/test-override.directive.ts", - "./src/app/modules/test-id/test/test.directive.ts", + "./src/app/modules/test-id/test.directive.ts", "./src/app/modules/tooltip/tooltip.component.ts", "./src/app/modules/truecommand/components/truecommand-signup-modal/truecommand-signup-modal.component.ts", "./src/app/pages/account/groups/store/group.actions.ts", From e286d73c91a4029103c0c3f0f0e554e0f346b802 Mon Sep 17 00:00:00 2001 From: Evgeny Stepanovych Date: Tue, 24 Sep 2024 12:32:12 +0200 Subject: [PATCH 3/5] NAS-131364: Move more components to standalone --- src/app/app.module.ts | 6 ++++++ src/app/modules/ix-icon/ix-icon.component.ts | 7 ------- src/setup-jest.ts | 4 ++++ 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 49b86336a0d..0662907783b 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -3,6 +3,7 @@ import { NgModule, ErrorHandler } from '@angular/core'; import { MatButtonModule } from '@angular/material/button'; import { MatNativeDateModule } from '@angular/material/core'; import { MatDialogModule } from '@angular/material/dialog'; +import { MatIconRegistry } from '@angular/material/icon'; import { MatSnackBarModule } from '@angular/material/snack-bar'; import { BrowserModule } from '@angular/platform-browser'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; @@ -29,6 +30,7 @@ import { createTranslateLoader } from 'app/core/classes/icu-translations-loader' import { MockEnclosureWebsocketService } from 'app/core/testing/mock-enclosure/mock-enclosure-websocket.service'; import { getWindow, WINDOW } from 'app/helpers/window.helper'; import { FeedbackModule } from 'app/modules/feedback/feedback.module'; +import { IxIconRegistry } from 'app/modules/ix-icon/ix-icon.service'; import { SnackbarModule } from 'app/modules/snackbar/snackbar.module'; import { TwoFactorGuardService } from 'app/services/auth/two-factor-guard.service'; import { ErrorHandlerService } from 'app/services/error-handler.service'; @@ -122,6 +124,10 @@ import { AuthGuardService } from './services/auth/auth-guard.service'; provide: WINDOW, useFactory: getWindow, }, + { + provide: MatIconRegistry, + useClass: IxIconRegistry, + }, { provide: WebSocketService, deps: [Router, WebSocketConnectionService, TranslateService], diff --git a/src/app/modules/ix-icon/ix-icon.component.ts b/src/app/modules/ix-icon/ix-icon.component.ts index b17487b1057..4d8308e2444 100644 --- a/src/app/modules/ix-icon/ix-icon.component.ts +++ b/src/app/modules/ix-icon/ix-icon.component.ts @@ -14,7 +14,6 @@ import { import { MatIcon, MatIconDefaultOptions, MatIconLocation, MatIconRegistry, MAT_ICON_DEFAULT_OPTIONS, MAT_ICON_LOCATION, } from '@angular/material/icon'; -import { IxIconRegistry } from 'app/modules/ix-icon/ix-icon.service'; /** * IxIcon component extends MatIcon @@ -38,12 +37,6 @@ import { IxIconRegistry } from 'app/modules/ix-icon/ix-icon.service'; // eslint-disable-next-line @angular-eslint/use-component-view-encapsulation encapsulation: ViewEncapsulation.None, changeDetection: ChangeDetectionStrategy.OnPush, - providers: [ - { - provide: MatIconRegistry, - useClass: IxIconRegistry, - }, - ], standalone: true, }) export class IxIconComponent extends MatIcon implements OnInit, OnChanges, AfterContentInit { diff --git a/src/setup-jest.ts b/src/setup-jest.ts index c59a89cabcf..840dec7637a 100644 --- a/src/setup-jest.ts +++ b/src/setup-jest.ts @@ -79,6 +79,9 @@ import { IxTableHeadComponent } from 'app/modules/ix-table/components/ix-table-h import { IxTablePagerComponent } from 'app/modules/ix-table/components/ix-table-pager/ix-table-pager.component'; import { IxTableEmptyDirective } from 'app/modules/ix-table/directives/ix-table-empty.directive'; import { AppLoaderService } from 'app/modules/loader/app-loader.service'; +import { + WithLoadingStateDirective, +} from 'app/modules/loader/directives/with-loading-state/with-loading-state.directive'; import { SnackbarModule } from 'app/modules/snackbar/snackbar.module'; import { TestOverrideDirective } from 'app/modules/test-id/test-override/test-override.directive'; import { TestDirective } from 'app/modules/test-id/test.directive'; @@ -145,6 +148,7 @@ defineGlobalsInjections({ IxTableBodyComponent, TestDirective, TestOverrideDirective, + WithLoadingStateDirective, TranslateModule.forRoot({ defaultLanguage: 'en', loader: { From 03a27a91918e6ce45b7022defeb59744bedfa9c4 Mon Sep 17 00:00:00 2001 From: Evgeny Stepanovych Date: Tue, 24 Sep 2024 13:53:51 +0200 Subject: [PATCH 4/5] NAS-131364: Move more components to standalone --- .../feedback-dialog.component.spec.ts | 2 ++ .../with-loading-state.directive.spec.ts | 7 ------- .../app-bulk-upgrade.component.spec.ts | 2 ++ .../installed-apps.component.spec.ts | 2 ++ .../widget-group-form.component.spec.ts | 1 - .../dataset-management.component.spec.ts | 8 +++++++- .../ipmi-events-dialog.component.spec.ts | 2 ++ .../reporting-exporters-list.component.spec.ts | 2 ++ .../associated-target-list.component.spec.ts | 2 ++ .../authorized-access-list.component.spec.ts | 2 ++ .../extent-list/extent-list.component.spec.ts | 2 ++ .../portal-list/portal-list.component.spec.ts | 2 ++ .../target-list/target-list.component.spec.ts | 2 ++ .../nfs/nfs-list/nfs-list.component.spec.ts | 2 ++ .../smb/smb-list/smb-list.component.spec.ts | 2 ++ src/app/pages/signin/signin.component.spec.ts | 4 ++-- .../pool-manager-wizard.component.spec.ts | 2 ++ .../pool-manager/tests/add-vdev-to-pool.spec.ts | 15 ++------------- .../pool-manager/tests/common.utils.ts | 17 +++++++++++++++++ .../pool-manager/tests/create-pool.spec.ts | 13 ++----------- .../tests/draid-pool-creation.spec.ts | 13 ++----------- .../pool-manager/tests/step-changing.spec.ts | 13 ++----------- .../tests/unsetting-on-fewer-disks.spec.ts | 13 ++----------- .../tests/wizard-reset-step.spec.ts | 13 ++----------- .../tests/wizard-start-over.spec.ts | 2 ++ .../bootenv-status.component.spec.ts | 2 ++ 26 files changed, 68 insertions(+), 79 deletions(-) diff --git a/src/app/modules/feedback/components/feedback-dialog/feedback-dialog.component.spec.ts b/src/app/modules/feedback/components/feedback-dialog/feedback-dialog.component.spec.ts index 682684ad77b..7c41b993c07 100644 --- a/src/app/modules/feedback/components/feedback-dialog/feedback-dialog.component.spec.ts +++ b/src/app/modules/feedback/components/feedback-dialog/feedback-dialog.component.spec.ts @@ -16,6 +16,7 @@ import { import { FeedbackType } from 'app/modules/feedback/interfaces/feedback.interface'; import { FeedbackService } from 'app/modules/feedback/services/feedback.service'; import { IxButtonGroupHarness } from 'app/modules/forms/ix-forms/components/ix-button-group/ix-button-group.harness'; +import { FakeProgressBarComponent } from 'app/modules/loader/components/fake-progress-bar/fake-progress-bar.component'; import { CastPipe } from 'app/modules/pipes/cast/cast.pipe'; import { SystemGeneralService } from 'app/services/system-general.service'; @@ -32,6 +33,7 @@ describe('FeedbackDialogComponent', () => { imports: [ ReactiveFormsModule, CastPipe, + FakeProgressBarComponent, ], declarations: [ MockComponents( diff --git a/src/app/modules/loader/directives/with-loading-state/with-loading-state.directive.spec.ts b/src/app/modules/loader/directives/with-loading-state/with-loading-state.directive.spec.ts index 41f1017f4db..4367a9666c6 100644 --- a/src/app/modules/loader/directives/with-loading-state/with-loading-state.directive.spec.ts +++ b/src/app/modules/loader/directives/with-loading-state/with-loading-state.directive.spec.ts @@ -1,8 +1,5 @@ import { createDirectiveFactory, SpectatorDirective } from '@ngneat/spectator/jest'; import { of } from 'rxjs'; -import { - WithLoadingStateErrorComponent, -} from 'app/modules/loader/directives/with-loading-state/with-loading-state-error/with-loading-state-error.component'; import { WithLoadingStateLoaderComponent, } from 'app/modules/loader/directives/with-loading-state/with-loading-state-loader/with-loading-state-loader.component'; @@ -12,10 +9,6 @@ describe('WithLoadingStateDirective', () => { let spectator: SpectatorDirective; const createDirective = createDirectiveFactory({ directive: WithLoadingStateDirective, - declarations: [ - WithLoadingStateLoaderComponent, - WithLoadingStateErrorComponent, - ], }); describe('when loading state is an observable', () => { diff --git a/src/app/pages/apps/components/installed-apps/app-bulk-upgrade/app-bulk-upgrade.component.spec.ts b/src/app/pages/apps/components/installed-apps/app-bulk-upgrade/app-bulk-upgrade.component.spec.ts index b7fa61cf9f5..d99c2390444 100644 --- a/src/app/pages/apps/components/installed-apps/app-bulk-upgrade/app-bulk-upgrade.component.spec.ts +++ b/src/app/pages/apps/components/installed-apps/app-bulk-upgrade/app-bulk-upgrade.component.spec.ts @@ -16,6 +16,7 @@ import { AppUpgradeSummary } from 'app/interfaces/application.interface'; import { CoreBulkQuery } from 'app/interfaces/core-bulk.interface'; import { DialogService } from 'app/modules/dialog/dialog.service'; import { BulkListItemComponent } from 'app/modules/lists/bulk-list-item/bulk-list-item.component'; +import { FakeProgressBarComponent } from 'app/modules/loader/components/fake-progress-bar/fake-progress-bar.component'; import { SnackbarService } from 'app/modules/snackbar/services/snackbar.service'; import { AppBulkUpgradeComponent } from 'app/pages/apps/components/installed-apps/app-bulk-upgrade/app-bulk-upgrade.component'; import { WebSocketService } from 'app/services/ws.service'; @@ -80,6 +81,7 @@ describe('AppBulkUpgradeComponent', () => { ReactiveFormsModule, ImgFallbackModule, LetDirective, + FakeProgressBarComponent, ], declarations: [ BulkListItemComponent, diff --git a/src/app/pages/apps/components/installed-apps/installed-apps.component.spec.ts b/src/app/pages/apps/components/installed-apps/installed-apps.component.spec.ts index f2be2c5987a..2ea58db293c 100644 --- a/src/app/pages/apps/components/installed-apps/installed-apps.component.spec.ts +++ b/src/app/pages/apps/components/installed-apps/installed-apps.component.spec.ts @@ -14,6 +14,7 @@ import { JobState } from 'app/enums/job-state.enum'; import { App } from 'app/interfaces/app.interface'; import { EmptyComponent } from 'app/modules/empty/empty.component'; import { SearchInput1Component } from 'app/modules/forms/search-input1/search-input1.component'; +import { FakeProgressBarComponent } from 'app/modules/loader/components/fake-progress-bar/fake-progress-bar.component'; import { PageHeaderModule } from 'app/modules/page-header/page-header.module'; import { AppDetailsPanelComponent } from 'app/pages/apps/components/installed-apps/app-details-panel/app-details-panel.component'; import { AppRowComponent } from 'app/pages/apps/components/installed-apps/app-row/app-row.component'; @@ -46,6 +47,7 @@ describe('InstalledAppsComponent', () => { ReactiveFormsModule, MatTableModule, MockModule(PageHeaderModule), + FakeProgressBarComponent, ], declarations: [ EmptyComponent, diff --git a/src/app/pages/dashboard/components/widget-group-form/widget-group-form.component.spec.ts b/src/app/pages/dashboard/components/widget-group-form/widget-group-form.component.spec.ts index dd6e60ff1c4..3cc88eb06e5 100644 --- a/src/app/pages/dashboard/components/widget-group-form/widget-group-form.component.spec.ts +++ b/src/app/pages/dashboard/components/widget-group-form/widget-group-form.component.spec.ts @@ -32,7 +32,6 @@ describe('WidgetGroupFormComponent', () => { const createComponent = createComponentFactory({ component: WidgetGroupFormComponent, imports: [ - TestIdModule, ReactiveFormsModule, ], declarations: [ diff --git a/src/app/pages/datasets/components/dataset-management/dataset-management.component.spec.ts b/src/app/pages/datasets/components/dataset-management/dataset-management.component.spec.ts index c5b4d35cffe..cbea049f5b7 100644 --- a/src/app/pages/datasets/components/dataset-management/dataset-management.component.spec.ts +++ b/src/app/pages/datasets/components/dataset-management/dataset-management.component.spec.ts @@ -9,6 +9,7 @@ import { EmptyComponent } from 'app/modules/empty/empty.component'; import { SearchInput1Component } from 'app/modules/forms/search-input1/search-input1.component'; import { TreeVirtualScrollViewComponent } from 'app/modules/ix-tree/components/tree-virtual-scroll-view/tree-virtual-scroll-view.component'; import { TreeModule } from 'app/modules/ix-tree/tree.module'; +import { FakeProgressBarComponent } from 'app/modules/loader/components/fake-progress-bar/fake-progress-bar.component'; import { DatasetsManagementComponent } from 'app/pages/datasets/components/dataset-management/dataset-management.component'; import { DatasetTreeStore } from 'app/pages/datasets/store/dataset-store.service'; @@ -26,7 +27,12 @@ describe('DatasetsManagementComponent', () => { const createComponent = createRoutingFactory({ component: DatasetsManagementComponent, - imports: [TreeModule, SearchInput1Component, EmptyComponent], + imports: [ + TreeModule, + SearchInput1Component, + EmptyComponent, + FakeProgressBarComponent, + ], providers: [ mockAuth(), mockWebSocket([ diff --git a/src/app/pages/network/components/ipmi-card/ipmi-events-dialog/ipmi-events-dialog.component.spec.ts b/src/app/pages/network/components/ipmi-card/ipmi-events-dialog/ipmi-events-dialog.component.spec.ts index faa992df07c..d25aefb9b81 100644 --- a/src/app/pages/network/components/ipmi-card/ipmi-events-dialog/ipmi-events-dialog.component.spec.ts +++ b/src/app/pages/network/components/ipmi-card/ipmi-events-dialog/ipmi-events-dialog.component.spec.ts @@ -8,6 +8,7 @@ import { fakeSuccessfulJob } from 'app/core/testing/utils/fake-job.utils'; import { mockJob, mockWebSocket } from 'app/core/testing/utils/mock-websocket.utils'; import { IpmiEvent } from 'app/interfaces/ipmi.interface'; import { EmptyComponent } from 'app/modules/empty/empty.component'; +import { FakeProgressBarComponent } from 'app/modules/loader/components/fake-progress-bar/fake-progress-bar.component'; import { IpmiEventsDialogComponent, } from 'app/pages/network/components/ipmi-card/ipmi-events-dialog/ipmi-events-dialog.component'; @@ -21,6 +22,7 @@ describe('IpmiEventsDialogComponent', () => { declarations: [ FakeFormatDateTimePipe, EmptyComponent, + FakeProgressBarComponent, ], providers: [ mockWebSocket([ diff --git a/src/app/pages/reports-dashboard/components/exporters/reporting-exporters-list/reporting-exporters-list.component.spec.ts b/src/app/pages/reports-dashboard/components/exporters/reporting-exporters-list/reporting-exporters-list.component.spec.ts index ad00d872819..cd0212a97c2 100644 --- a/src/app/pages/reports-dashboard/components/exporters/reporting-exporters-list/reporting-exporters-list.component.spec.ts +++ b/src/app/pages/reports-dashboard/components/exporters/reporting-exporters-list/reporting-exporters-list.component.spec.ts @@ -11,6 +11,7 @@ import { IxSlideInRef } from 'app/modules/forms/ix-forms/components/ix-slide-in/ import { SearchInput1Component } from 'app/modules/forms/search-input1/search-input1.component'; import { IxIconHarness } from 'app/modules/ix-icon/ix-icon.harness'; import { IxTableHarness } from 'app/modules/ix-table/components/ix-table/ix-table.harness'; +import { FakeProgressBarComponent } from 'app/modules/loader/components/fake-progress-bar/fake-progress-bar.component'; import { ReportingExportersFormComponent } from 'app/pages/reports-dashboard/components/exporters/reporting-exporters-form/reporting-exporters-form.component'; import { ReportingExporterListComponent } from 'app/pages/reports-dashboard/components/exporters/reporting-exporters-list/reporting-exporters-list.component'; import { IxSlideInService } from 'app/services/ix-slide-in.service'; @@ -38,6 +39,7 @@ describe('ReportingExportersListComponent', () => { component: ReportingExporterListComponent, imports: [ SearchInput1Component, + FakeProgressBarComponent, ], providers: [ mockWebSocket([ diff --git a/src/app/pages/sharing/iscsi/associated-target/associated-target-list/associated-target-list.component.spec.ts b/src/app/pages/sharing/iscsi/associated-target/associated-target-list/associated-target-list.component.spec.ts index 0cdcf9454cc..516cc192819 100644 --- a/src/app/pages/sharing/iscsi/associated-target/associated-target-list/associated-target-list.component.spec.ts +++ b/src/app/pages/sharing/iscsi/associated-target/associated-target-list/associated-target-list.component.spec.ts @@ -15,6 +15,7 @@ import { IxTableHarness } from 'app/modules/ix-table/components/ix-table/ix-tabl import { IxTableColumnsSelectorComponent, } from 'app/modules/ix-table/components/ix-table-columns-selector/ix-table-columns-selector.component'; +import { FakeProgressBarComponent } from 'app/modules/loader/components/fake-progress-bar/fake-progress-bar.component'; import { AssociatedTargetFormComponent } from 'app/pages/sharing/iscsi/associated-target/associated-target-form/associated-target-form.component'; import { AssociatedTargetListComponent } from 'app/pages/sharing/iscsi/associated-target/associated-target-list/associated-target-list.component'; import { IxSlideInService } from 'app/services/ix-slide-in.service'; @@ -47,6 +48,7 @@ describe('AssociatedTargetListComponent', () => { imports: [ SearchInput1Component, IxTableColumnsSelectorComponent, + FakeProgressBarComponent, ], providers: [ mockAuth(), diff --git a/src/app/pages/sharing/iscsi/authorized-access/authorized-access-list/authorized-access-list.component.spec.ts b/src/app/pages/sharing/iscsi/authorized-access/authorized-access-list/authorized-access-list.component.spec.ts index ba45af51e2f..b3d7a60990b 100644 --- a/src/app/pages/sharing/iscsi/authorized-access/authorized-access-list/authorized-access-list.component.spec.ts +++ b/src/app/pages/sharing/iscsi/authorized-access/authorized-access-list/authorized-access-list.component.spec.ts @@ -16,6 +16,7 @@ import { IxTableHarness } from 'app/modules/ix-table/components/ix-table/ix-tabl import { IxTableColumnsSelectorComponent, } from 'app/modules/ix-table/components/ix-table-columns-selector/ix-table-columns-selector.component'; +import { FakeProgressBarComponent } from 'app/modules/loader/components/fake-progress-bar/fake-progress-bar.component'; import { AuthorizedAccessFormComponent } from 'app/pages/sharing/iscsi/authorized-access/authorized-access-form/authorized-access-form.component'; import { AuthorizedAccessListComponent } from 'app/pages/sharing/iscsi/authorized-access/authorized-access-list/authorized-access-list.component'; import { IxSlideInService } from 'app/services/ix-slide-in.service'; @@ -40,6 +41,7 @@ describe('AuthorizedAccessListComponent', () => { imports: [ SearchInput1Component, IxTableColumnsSelectorComponent, + FakeProgressBarComponent, ], providers: [ mockAuth(), diff --git a/src/app/pages/sharing/iscsi/extent/extent-list/extent-list.component.spec.ts b/src/app/pages/sharing/iscsi/extent/extent-list/extent-list.component.spec.ts index 6c50f160648..ae3985ea259 100644 --- a/src/app/pages/sharing/iscsi/extent/extent-list/extent-list.component.spec.ts +++ b/src/app/pages/sharing/iscsi/extent/extent-list/extent-list.component.spec.ts @@ -16,6 +16,7 @@ import { IxTableHarness } from 'app/modules/ix-table/components/ix-table/ix-tabl import { IxTableColumnsSelectorComponent, } from 'app/modules/ix-table/components/ix-table-columns-selector/ix-table-columns-selector.component'; +import { FakeProgressBarComponent } from 'app/modules/loader/components/fake-progress-bar/fake-progress-bar.component'; import { ExtentFormComponent } from 'app/pages/sharing/iscsi/extent/extent-form/extent-form.component'; import { DeleteExtentDialogComponent } from 'app/pages/sharing/iscsi/extent/extent-list/delete-extent-dialog/delete-extent-dialog.component'; import { ExtentListComponent } from 'app/pages/sharing/iscsi/extent/extent-list/extent-list.component'; @@ -43,6 +44,7 @@ describe('ExtentListComponent', () => { imports: [ SearchInput1Component, IxTableColumnsSelectorComponent, + FakeProgressBarComponent, ], providers: [ mockProvider(EmptyService), diff --git a/src/app/pages/sharing/iscsi/portal/portal-list/portal-list.component.spec.ts b/src/app/pages/sharing/iscsi/portal/portal-list/portal-list.component.spec.ts index 901b81533d7..0807cf67127 100644 --- a/src/app/pages/sharing/iscsi/portal/portal-list/portal-list.component.spec.ts +++ b/src/app/pages/sharing/iscsi/portal/portal-list/portal-list.component.spec.ts @@ -18,6 +18,7 @@ import { IxTableHarness } from 'app/modules/ix-table/components/ix-table/ix-tabl import { IxTableColumnsSelectorComponent, } from 'app/modules/ix-table/components/ix-table-columns-selector/ix-table-columns-selector.component'; +import { FakeProgressBarComponent } from 'app/modules/loader/components/fake-progress-bar/fake-progress-bar.component'; import { PortalFormComponent } from 'app/pages/sharing/iscsi/portal/portal-form/portal-form.component'; import { PortalListComponent } from 'app/pages/sharing/iscsi/portal/portal-list/portal-list.component'; import { IxSlideInService } from 'app/services/ix-slide-in.service'; @@ -47,6 +48,7 @@ describe('PortalListComponent', () => { imports: [ SearchInput1Component, IxTableColumnsSelectorComponent, + FakeProgressBarComponent, ], providers: [ mockProvider(EmptyService), diff --git a/src/app/pages/sharing/iscsi/target/target-list/target-list.component.spec.ts b/src/app/pages/sharing/iscsi/target/target-list/target-list.component.spec.ts index de2c8ebefea..231c5fb6a61 100644 --- a/src/app/pages/sharing/iscsi/target/target-list/target-list.component.spec.ts +++ b/src/app/pages/sharing/iscsi/target/target-list/target-list.component.spec.ts @@ -15,6 +15,7 @@ import { IxTableHarness } from 'app/modules/ix-table/components/ix-table/ix-tabl import { IxTableColumnsSelectorComponent, } from 'app/modules/ix-table/components/ix-table-columns-selector/ix-table-columns-selector.component'; +import { FakeProgressBarComponent } from 'app/modules/loader/components/fake-progress-bar/fake-progress-bar.component'; import { TargetFormComponent } from 'app/pages/sharing/iscsi/target/target-form/target-form.component'; import { TargetListComponent } from 'app/pages/sharing/iscsi/target/target-list/target-list.component'; import { IxSlideInService } from 'app/services/ix-slide-in.service'; @@ -36,6 +37,7 @@ describe('TargetListComponent', () => { imports: [ SearchInput1Component, IxTableColumnsSelectorComponent, + FakeProgressBarComponent, ], providers: [ mockProvider(EmptyService), diff --git a/src/app/pages/sharing/nfs/nfs-list/nfs-list.component.spec.ts b/src/app/pages/sharing/nfs/nfs-list/nfs-list.component.spec.ts index 903db693ddd..01982babb35 100644 --- a/src/app/pages/sharing/nfs/nfs-list/nfs-list.component.spec.ts +++ b/src/app/pages/sharing/nfs/nfs-list/nfs-list.component.spec.ts @@ -15,6 +15,7 @@ import { IxTableHarness } from 'app/modules/ix-table/components/ix-table/ix-tabl import { IxTableColumnsSelectorComponent, } from 'app/modules/ix-table/components/ix-table-columns-selector/ix-table-columns-selector.component'; +import { FakeProgressBarComponent } from 'app/modules/loader/components/fake-progress-bar/fake-progress-bar.component'; import { NfsFormComponent } from 'app/pages/sharing/nfs/nfs-form/nfs-form.component'; import { NfsListComponent } from 'app/pages/sharing/nfs/nfs-list/nfs-list.component'; import { IxSlideInService } from 'app/services/ix-slide-in.service'; @@ -41,6 +42,7 @@ describe('NfsListComponent', () => { imports: [ SearchInput1Component, IxTableColumnsSelectorComponent, + FakeProgressBarComponent, ], providers: [ mockAuth(), diff --git a/src/app/pages/sharing/smb/smb-list/smb-list.component.spec.ts b/src/app/pages/sharing/smb/smb-list/smb-list.component.spec.ts index 219d71528ee..68cb4c0fb30 100644 --- a/src/app/pages/sharing/smb/smb-list/smb-list.component.spec.ts +++ b/src/app/pages/sharing/smb/smb-list/smb-list.component.spec.ts @@ -21,6 +21,7 @@ import { IxTableHarness } from 'app/modules/ix-table/components/ix-table/ix-tabl import { IxTableColumnsSelectorComponent, } from 'app/modules/ix-table/components/ix-table-columns-selector/ix-table-columns-selector.component'; +import { FakeProgressBarComponent } from 'app/modules/loader/components/fake-progress-bar/fake-progress-bar.component'; import { ServiceStateButtonComponent } from 'app/pages/sharing/components/shares-dashboard/service-state-button/service-state-button.component'; import { SmbAclComponent } from 'app/pages/sharing/smb/smb-acl/smb-acl.component'; import { SmbFormComponent } from 'app/pages/sharing/smb/smb-form/smb-form.component'; @@ -53,6 +54,7 @@ describe('SmbListComponent', () => { imports: [ SearchInput1Component, IxTableColumnsSelectorComponent, + FakeProgressBarComponent, ], declarations: [ MockComponents( diff --git a/src/app/pages/signin/signin.component.spec.ts b/src/app/pages/signin/signin.component.spec.ts index 8b93c2edaf3..e316bd3beb6 100644 --- a/src/app/pages/signin/signin.component.spec.ts +++ b/src/app/pages/signin/signin.component.spec.ts @@ -1,6 +1,6 @@ import { MatInputModule } from '@angular/material/input'; import { createComponentFactory, mockProvider, Spectator } from '@ngneat/spectator/jest'; -import { MockComponents, MockModule } from 'ng-mocks'; +import { MockComponents } from 'ng-mocks'; import { BehaviorSubject, of } from 'rxjs'; import { FailoverDisabledReason } from 'app/enums/failover-disabled-reason.enum'; import { FailoverStatus } from 'app/enums/failover-status.enum'; @@ -44,7 +44,7 @@ describe('SigninComponent', () => { component: SigninComponent, imports: [ MatInputModule, - MockModule(IxIconComponent), + MockComponents(IxIconComponent), ], declarations: [ MockComponents( diff --git a/src/app/pages/storage/modules/pool-manager/components/pool-manager-wizard/pool-manager-wizard.component.spec.ts b/src/app/pages/storage/modules/pool-manager/components/pool-manager-wizard/pool-manager-wizard.component.spec.ts index befdfd08e0d..a5880a0b952 100644 --- a/src/app/pages/storage/modules/pool-manager/components/pool-manager-wizard/pool-manager-wizard.component.spec.ts +++ b/src/app/pages/storage/modules/pool-manager/components/pool-manager-wizard/pool-manager-wizard.component.spec.ts @@ -13,6 +13,7 @@ import { mockCall, mockJob, mockWebSocket } from 'app/core/testing/utils/mock-we import { CreateVdevLayout, VdevType } from 'app/enums/v-dev-type.enum'; import { Pool } from 'app/interfaces/pool.interface'; import { DialogService } from 'app/modules/dialog/dialog.service'; +import { FakeProgressBarComponent } from 'app/modules/loader/components/fake-progress-bar/fake-progress-bar.component'; import { SnackbarService } from 'app/modules/snackbar/services/snackbar.service'; import { AddVdevsStore } from 'app/pages/storage/modules/pool-manager/components/add-vdevs/store/add-vdevs-store.service'; import { @@ -98,6 +99,7 @@ describe('PoolManagerWizardComponent', () => { component: PoolManagerWizardComponent, imports: [ MatStepperModule, + FakeProgressBarComponent, ], declarations: [ MockComponents( diff --git a/src/app/pages/storage/modules/pool-manager/components/pool-manager/tests/add-vdev-to-pool.spec.ts b/src/app/pages/storage/modules/pool-manager/components/pool-manager/tests/add-vdev-to-pool.spec.ts index 567ef8b2ec4..3423889b63d 100644 --- a/src/app/pages/storage/modules/pool-manager/components/pool-manager/tests/add-vdev-to-pool.spec.ts +++ b/src/app/pages/storage/modules/pool-manager/components/pool-manager/tests/add-vdev-to-pool.spec.ts @@ -1,6 +1,4 @@ import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; -import { ReactiveFormsModule } from '@angular/forms'; -import { MatStepperModule } from '@angular/material/stepper'; import { Router } from '@angular/router'; import { createComponentFactory, mockProvider, Spectator } from '@ngneat/spectator/jest'; import { of } from 'rxjs'; @@ -13,15 +11,11 @@ import { TopologyItemType } from 'app/enums/v-dev-type.enum'; import { DetailsDisk } from 'app/interfaces/disk.interface'; import { Enclosure } from 'app/interfaces/enclosure.interface'; import { DialogService } from 'app/modules/dialog/dialog.service'; -import { IxWarningComponent } from 'app/modules/forms/ix-forms/components/ix-warning/ix-warning.component'; -import { CastPipe } from 'app/modules/pipes/cast/cast.pipe'; -import { FileSizePipe } from 'app/modules/pipes/file-size/file-size.pipe'; -import { MapValuePipe } from 'app/modules/pipes/map-value/map-value.pipe'; import { AddVdevsComponent } from 'app/pages/storage/modules/pool-manager/components/add-vdevs/add-vdevs.component'; import { AddVdevsStore } from 'app/pages/storage/modules/pool-manager/components/add-vdevs/store/add-vdevs-store.service'; import { existingPool, existingPoolDisks } from 'app/pages/storage/modules/pool-manager/components/pool-manager/tests/add-vdev-to-pool-data'; import { - commonDeclarations, + commonDeclarations, commonImports, commonProviders, } from 'app/pages/storage/modules/pool-manager/components/pool-manager/tests/common.utils'; import { @@ -37,12 +31,7 @@ describe('AddVdevsComponent – Add Vdev to existing pool', () => { const createComponent = createComponentFactory({ component: AddVdevsComponent, imports: [ - ReactiveFormsModule, - MatStepperModule, - FileSizePipe, - MapValuePipe, - CastPipe, - IxWarningComponent, + ...commonImports, ], declarations: [ ...commonDeclarations, diff --git a/src/app/pages/storage/modules/pool-manager/components/pool-manager/tests/common.utils.ts b/src/app/pages/storage/modules/pool-manager/components/pool-manager/tests/common.utils.ts index b88db7051c3..a0518b088d0 100644 --- a/src/app/pages/storage/modules/pool-manager/components/pool-manager/tests/common.utils.ts +++ b/src/app/pages/storage/modules/pool-manager/components/pool-manager/tests/common.utils.ts @@ -1,12 +1,19 @@ +import { ReactiveFormsModule } from '@angular/forms'; import { MatDialog } from '@angular/material/dialog'; import { MatIconRegistry } from '@angular/material/icon'; +import { MatStepperModule } from '@angular/material/stepper'; import { createSpyObject, mockProvider } from '@ngneat/spectator/jest'; import { provideMockStore } from '@ngrx/store/testing'; import { EMPTY, of } from 'rxjs'; import { Job } from 'app/interfaces/job.interface'; import { Pool } from 'app/interfaces/pool.interface'; import { DialogService } from 'app/modules/dialog/dialog.service'; +import { IxWarningComponent } from 'app/modules/forms/ix-forms/components/ix-warning/ix-warning.component'; import { IxIconRegistry } from 'app/modules/ix-icon/ix-icon.service'; +import { FakeProgressBarComponent } from 'app/modules/loader/components/fake-progress-bar/fake-progress-bar.component'; +import { CastPipe } from 'app/modules/pipes/cast/cast.pipe'; +import { FileSizePipe } from 'app/modules/pipes/file-size/file-size.pipe'; +import { MapValuePipe } from 'app/modules/pipes/map-value/map-value.pipe'; import { AddVdevsStore, } from 'app/pages/storage/modules/pool-manager/components/add-vdevs/store/add-vdevs-store.service'; @@ -85,6 +92,16 @@ import { } from 'app/pages/storage/modules/pool-manager/utils/generate-vdevs/generate-vdevs.service'; import { selectHasEnclosureSupport } from 'app/store/system-info/system-info.selectors'; +export const commonImports = [ + ReactiveFormsModule, + MatStepperModule, + FileSizePipe, + MapValuePipe, + CastPipe, + IxWarningComponent, + FakeProgressBarComponent, +]; + export const commonDeclarations = [ ConfigurationPreviewComponent, ExistingConfigurationPreviewComponent, diff --git a/src/app/pages/storage/modules/pool-manager/components/pool-manager/tests/create-pool.spec.ts b/src/app/pages/storage/modules/pool-manager/components/pool-manager/tests/create-pool.spec.ts index 094ce93e0bc..e4467ec70c9 100644 --- a/src/app/pages/storage/modules/pool-manager/components/pool-manager/tests/create-pool.spec.ts +++ b/src/app/pages/storage/modules/pool-manager/components/pool-manager/tests/create-pool.spec.ts @@ -1,6 +1,4 @@ import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; -import { ReactiveFormsModule } from '@angular/forms'; -import { MatStepperModule } from '@angular/material/stepper'; import { Router } from '@angular/router'; import { createComponentFactory, mockProvider, Spectator } from '@ngneat/spectator/jest'; import { of } from 'rxjs'; @@ -11,14 +9,11 @@ import { mockCall, mockJob, mockWebSocket } from 'app/core/testing/utils/mock-we import { DiskType } from 'app/enums/disk-type.enum'; import { DetailsDisk } from 'app/interfaces/disk.interface'; import { Enclosure } from 'app/interfaces/enclosure.interface'; -import { CastPipe } from 'app/modules/pipes/cast/cast.pipe'; -import { FileSizePipe } from 'app/modules/pipes/file-size/file-size.pipe'; -import { MapValuePipe } from 'app/modules/pipes/map-value/map-value.pipe'; import { PoolManagerComponent, } from 'app/pages/storage/modules/pool-manager/components/pool-manager/pool-manager.component'; import { - commonDeclarations, + commonDeclarations, commonImports, commonProviders, } from 'app/pages/storage/modules/pool-manager/components/pool-manager/tests/common.utils'; import { @@ -33,11 +28,7 @@ describe('PoolManagerComponent – create pool', () => { const createComponent = createComponentFactory({ component: PoolManagerComponent, imports: [ - ReactiveFormsModule, - MatStepperModule, - FileSizePipe, - MapValuePipe, - CastPipe, + ...commonImports, ], declarations: [ ...commonDeclarations, diff --git a/src/app/pages/storage/modules/pool-manager/components/pool-manager/tests/draid-pool-creation.spec.ts b/src/app/pages/storage/modules/pool-manager/components/pool-manager/tests/draid-pool-creation.spec.ts index 67625dab12d..b6daf845af5 100644 --- a/src/app/pages/storage/modules/pool-manager/components/pool-manager/tests/draid-pool-creation.spec.ts +++ b/src/app/pages/storage/modules/pool-manager/components/pool-manager/tests/draid-pool-creation.spec.ts @@ -1,6 +1,4 @@ import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; -import { ReactiveFormsModule } from '@angular/forms'; -import { MatStepperModule } from '@angular/material/stepper'; import { Router } from '@angular/router'; import { createComponentFactory, mockProvider, Spectator } from '@ngneat/spectator/jest'; import { of } from 'rxjs'; @@ -13,14 +11,11 @@ import { CreateVdevLayout } from 'app/enums/v-dev-type.enum'; import { DetailsDisk } from 'app/interfaces/disk.interface'; import { Enclosure } from 'app/interfaces/enclosure.interface'; import { DialogService } from 'app/modules/dialog/dialog.service'; -import { CastPipe } from 'app/modules/pipes/cast/cast.pipe'; -import { FileSizePipe } from 'app/modules/pipes/file-size/file-size.pipe'; -import { MapValuePipe } from 'app/modules/pipes/map-value/map-value.pipe'; import { PoolManagerComponent, } from 'app/pages/storage/modules/pool-manager/components/pool-manager/pool-manager.component'; import { - commonDeclarations, + commonDeclarations, commonImports, commonProviders, } from 'app/pages/storage/modules/pool-manager/components/pool-manager/tests/common.utils'; import { @@ -35,11 +30,7 @@ describe('PoolManagerComponent – creating dRAID pool', () => { const createComponent = createComponentFactory({ component: PoolManagerComponent, imports: [ - ReactiveFormsModule, - MatStepperModule, - FileSizePipe, - MapValuePipe, - CastPipe, + ...commonImports, ], declarations: [ ...commonDeclarations, diff --git a/src/app/pages/storage/modules/pool-manager/components/pool-manager/tests/step-changing.spec.ts b/src/app/pages/storage/modules/pool-manager/components/pool-manager/tests/step-changing.spec.ts index 0575d568a49..fac108dccaf 100644 --- a/src/app/pages/storage/modules/pool-manager/components/pool-manager/tests/step-changing.spec.ts +++ b/src/app/pages/storage/modules/pool-manager/components/pool-manager/tests/step-changing.spec.ts @@ -1,6 +1,4 @@ import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; -import { ReactiveFormsModule } from '@angular/forms'; -import { MatStepperModule } from '@angular/material/stepper'; import { createComponentFactory, mockProvider, Spectator } from '@ngneat/spectator/jest'; import { of } from 'rxjs'; import { GiB } from 'app/constants/bytes.constant'; @@ -11,14 +9,11 @@ import { DiskType } from 'app/enums/disk-type.enum'; import { VdevType } from 'app/enums/v-dev-type.enum'; import { DetailsDisk } from 'app/interfaces/disk.interface'; import { Enclosure } from 'app/interfaces/enclosure.interface'; -import { CastPipe } from 'app/modules/pipes/cast/cast.pipe'; -import { FileSizePipe } from 'app/modules/pipes/file-size/file-size.pipe'; -import { MapValuePipe } from 'app/modules/pipes/map-value/map-value.pipe'; import { PoolManagerComponent, } from 'app/pages/storage/modules/pool-manager/components/pool-manager/pool-manager.component'; import { - commonDeclarations, + commonDeclarations, commonImports, commonProviders, } from 'app/pages/storage/modules/pool-manager/components/pool-manager/tests/common.utils'; import { @@ -34,11 +29,7 @@ describe('PoolManagerComponent – step changing', () => { const createComponent = createComponentFactory({ component: PoolManagerComponent, imports: [ - ReactiveFormsModule, - MatStepperModule, - FileSizePipe, - MapValuePipe, - CastPipe, + ...commonImports, ], declarations: [ ...commonDeclarations, diff --git a/src/app/pages/storage/modules/pool-manager/components/pool-manager/tests/unsetting-on-fewer-disks.spec.ts b/src/app/pages/storage/modules/pool-manager/components/pool-manager/tests/unsetting-on-fewer-disks.spec.ts index 6c814f8ff12..60146c2e850 100644 --- a/src/app/pages/storage/modules/pool-manager/components/pool-manager/tests/unsetting-on-fewer-disks.spec.ts +++ b/src/app/pages/storage/modules/pool-manager/components/pool-manager/tests/unsetting-on-fewer-disks.spec.ts @@ -1,7 +1,5 @@ import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; -import { ReactiveFormsModule } from '@angular/forms'; import { MatCheckboxHarness } from '@angular/material/checkbox/testing'; -import { MatStepperModule } from '@angular/material/stepper'; import { createComponentFactory, mockProvider, Spectator } from '@ngneat/spectator/jest'; import { of } from 'rxjs'; import { GiB } from 'app/constants/bytes.constant'; @@ -11,14 +9,11 @@ import { DiskType } from 'app/enums/disk-type.enum'; import { DetailsDisk } from 'app/interfaces/disk.interface'; import { Enclosure } from 'app/interfaces/enclosure.interface'; import { IxRadioGroupHarness } from 'app/modules/forms/ix-forms/components/ix-radio-group/ix-radio-group.harness'; -import { CastPipe } from 'app/modules/pipes/cast/cast.pipe'; -import { FileSizePipe } from 'app/modules/pipes/file-size/file-size.pipe'; -import { MapValuePipe } from 'app/modules/pipes/map-value/map-value.pipe'; import { PoolManagerComponent, } from 'app/pages/storage/modules/pool-manager/components/pool-manager/pool-manager.component'; import { - commonDeclarations, + commonDeclarations, commonImports, commonProviders, } from 'app/pages/storage/modules/pool-manager/components/pool-manager/tests/common.utils'; import { @@ -32,11 +27,7 @@ describe('PoolManagerComponent – unsetting on fewer disks', () => { const createComponent = createComponentFactory({ component: PoolManagerComponent, imports: [ - ReactiveFormsModule, - MatStepperModule, - FileSizePipe, - MapValuePipe, - CastPipe, + ...commonImports, ], declarations: [ ...commonDeclarations, diff --git a/src/app/pages/storage/modules/pool-manager/components/pool-manager/tests/wizard-reset-step.spec.ts b/src/app/pages/storage/modules/pool-manager/components/pool-manager/tests/wizard-reset-step.spec.ts index 71e74c1625f..9a72a7c2497 100644 --- a/src/app/pages/storage/modules/pool-manager/components/pool-manager/tests/wizard-reset-step.spec.ts +++ b/src/app/pages/storage/modules/pool-manager/components/pool-manager/tests/wizard-reset-step.spec.ts @@ -1,7 +1,5 @@ import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; -import { ReactiveFormsModule } from '@angular/forms'; import { MatButtonHarness } from '@angular/material/button/testing'; -import { MatStepperModule } from '@angular/material/stepper'; import { createComponentFactory, mockProvider, Spectator } from '@ngneat/spectator/jest'; import { of } from 'rxjs'; import { GiB } from 'app/constants/bytes.constant'; @@ -11,14 +9,11 @@ import { DiskType } from 'app/enums/disk-type.enum'; import { DetailsDisk } from 'app/interfaces/disk.interface'; import { Enclosure } from 'app/interfaces/enclosure.interface'; import { DialogService } from 'app/modules/dialog/dialog.service'; -import { CastPipe } from 'app/modules/pipes/cast/cast.pipe'; -import { FileSizePipe } from 'app/modules/pipes/file-size/file-size.pipe'; -import { MapValuePipe } from 'app/modules/pipes/map-value/map-value.pipe'; import { PoolManagerComponent, } from 'app/pages/storage/modules/pool-manager/components/pool-manager/pool-manager.component'; import { - commonDeclarations, + commonDeclarations, commonImports, commonProviders, } from 'app/pages/storage/modules/pool-manager/components/pool-manager/tests/common.utils'; import { @@ -32,11 +27,7 @@ describe('PoolManagerComponent – wizard step reset', () => { const createComponent = createComponentFactory({ component: PoolManagerComponent, imports: [ - ReactiveFormsModule, - MatStepperModule, - FileSizePipe, - MapValuePipe, - CastPipe, + ...commonImports, ], declarations: [ ...commonDeclarations, diff --git a/src/app/pages/storage/modules/pool-manager/components/pool-manager/tests/wizard-start-over.spec.ts b/src/app/pages/storage/modules/pool-manager/components/pool-manager/tests/wizard-start-over.spec.ts index 4b1fa38d679..3f2809fc4cd 100644 --- a/src/app/pages/storage/modules/pool-manager/components/pool-manager/tests/wizard-start-over.spec.ts +++ b/src/app/pages/storage/modules/pool-manager/components/pool-manager/tests/wizard-start-over.spec.ts @@ -12,6 +12,7 @@ import { Enclosure } from 'app/interfaces/enclosure.interface'; import { DialogService } from 'app/modules/dialog/dialog.service'; import { IxRadioGroupHarness } from 'app/modules/forms/ix-forms/components/ix-radio-group/ix-radio-group.harness'; import { IxWarningComponent } from 'app/modules/forms/ix-forms/components/ix-warning/ix-warning.component'; +import { FakeProgressBarComponent } from 'app/modules/loader/components/fake-progress-bar/fake-progress-bar.component'; import { CastPipe } from 'app/modules/pipes/cast/cast.pipe'; import { FileSizePipe } from 'app/modules/pipes/file-size/file-size.pipe'; import { MapValuePipe } from 'app/modules/pipes/map-value/map-value.pipe'; @@ -39,6 +40,7 @@ describe('PoolManagerComponent – start over functionality', () => { MapValuePipe, CastPipe, IxWarningComponent, + FakeProgressBarComponent, ], declarations: [ ...commonDeclarations, diff --git a/src/app/pages/system/bootenv/bootenv-status/bootenv-status.component.spec.ts b/src/app/pages/system/bootenv/bootenv-status/bootenv-status.component.spec.ts index 79dc9a94885..a450b3a727f 100644 --- a/src/app/pages/system/bootenv/bootenv-status/bootenv-status.component.spec.ts +++ b/src/app/pages/system/bootenv/bootenv-status/bootenv-status.component.spec.ts @@ -14,6 +14,7 @@ import { TopologyItem } from 'app/interfaces/storage.interface'; import { DialogService } from 'app/modules/dialog/dialog.service'; import { TreeHarness } from 'app/modules/ix-tree/testing/tree.harness'; import { TreeModule } from 'app/modules/ix-tree/tree.module'; +import { FakeProgressBarComponent } from 'app/modules/loader/components/fake-progress-bar/fake-progress-bar.component'; import { SnackbarService } from 'app/modules/snackbar/services/snackbar.service'; import { BootStatusListComponent } from 'app/pages/system/bootenv/bootenv-status/bootenv-status.component'; import { BootenvNodeItemComponent } from './bootenv-node-item/bootenv-node-item.component'; @@ -64,6 +65,7 @@ describe('BootStatusListComponent', () => { component: BootStatusListComponent, imports: [ TreeModule, + FakeProgressBarComponent, ], providers: [ mockAuth(), From cc3d8505f2457688687f9339b960147d8807e9ec Mon Sep 17 00:00:00 2001 From: Evgeny Stepanovych Date: Wed, 25 Sep 2024 15:24:09 +0200 Subject: [PATCH 5/5] NAS-131364: Move more components to standalone --- .../initiator/initiator-list/initiator-list.component.spec.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/app/pages/sharing/iscsi/initiator/initiator-list/initiator-list.component.spec.ts b/src/app/pages/sharing/iscsi/initiator/initiator-list/initiator-list.component.spec.ts index 4a237184a53..56400d1ae37 100644 --- a/src/app/pages/sharing/iscsi/initiator/initiator-list/initiator-list.component.spec.ts +++ b/src/app/pages/sharing/iscsi/initiator/initiator-list/initiator-list.component.spec.ts @@ -18,6 +18,7 @@ import { IxTableHarness } from 'app/modules/ix-table/components/ix-table/ix-tabl import { IxTableColumnsSelectorComponent, } from 'app/modules/ix-table/components/ix-table-columns-selector/ix-table-columns-selector.component'; +import { FakeProgressBarComponent } from 'app/modules/loader/components/fake-progress-bar/fake-progress-bar.component'; import { InitiatorListComponent } from 'app/pages/sharing/iscsi/initiator/initiator-list/initiator-list.component'; import { IxSlideInService } from 'app/services/ix-slide-in.service'; import { WebSocketService } from 'app/services/ws.service'; @@ -39,6 +40,7 @@ describe('InitiatorListComponent', () => { imports: [ SearchInput1Component, IxTableColumnsSelectorComponent, + FakeProgressBarComponent, ], providers: [ mockAuth(),