From: Đặng Minh Dũng Date: Mon, 2 Nov 2020 03:15:20 +0000 (+0700) Subject: mgr/dashboard: refactor imports X-Git-Tag: v16.1.0~629^2~3 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4ad1cc01dc5597de34827e4221bee9700438eb55;p=ceph.git mgr/dashboard: refactor imports Signed-off-by: Đặng Minh Dũng --- diff --git a/src/pybind/mgr/dashboard/frontend/cypress/support/commands.ts b/src/pybind/mgr/dashboard/frontend/cypress/support/commands.ts index 106ad50c121..3d6dfeafa18 100644 --- a/src/pybind/mgr/dashboard/frontend/cypress/support/commands.ts +++ b/src/pybind/mgr/dashboard/frontend/cypress/support/commands.ts @@ -7,7 +7,7 @@ declare global { } } -import { Permissions } from '../../src/app/shared/models/permissions'; +import { Permissions } from '~/app/shared/models/permissions'; let auth: any; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/app.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/app.component.spec.ts index acf3a1219de..71643d37c65 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/app.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/app.component.spec.ts @@ -1,7 +1,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; -import { configureTestBed } from '../testing/unit-test-helper'; +import { configureTestBed } from '~/testing/unit-test-helper'; import { AppComponent } from './app.component'; describe('AppComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/block.module.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/block.module.ts index 9a9a392c022..e6c5e68ca0d 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/block.module.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/block.module.ts @@ -6,9 +6,9 @@ import { RouterModule, Routes } from '@angular/router'; import { TreeModule } from '@circlon/angular-tree-component'; import { NgbNavModule, NgbPopoverModule, NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap'; -import { ActionLabels, URLVerbs } from '../../shared/constants/app.constants'; -import { FeatureTogglesGuardService } from '../../shared/services/feature-toggles-guard.service'; -import { SharedModule } from '../../shared/shared.module'; +import { ActionLabels, URLVerbs } from '~/app/shared/constants/app.constants'; +import { FeatureTogglesGuardService } from '~/app/shared/services/feature-toggles-guard.service'; +import { SharedModule } from '~/app/shared/shared.module'; import { IscsiSettingComponent } from './iscsi-setting/iscsi-setting.component'; import { IscsiTabsComponent } from './iscsi-tabs/iscsi-tabs.component'; import { IscsiTargetDetailsComponent } from './iscsi-target-details/iscsi-target-details.component'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-setting/iscsi-setting.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-setting/iscsi-setting.component.spec.ts index 3f272d9bab5..d5bd9888f47 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-setting/iscsi-setting.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-setting/iscsi-setting.component.spec.ts @@ -1,9 +1,9 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { FormControl, NgForm, ReactiveFormsModule } from '@angular/forms'; -import { configureTestBed } from '../../../../testing/unit-test-helper'; -import { CdFormGroup } from '../../../shared/forms/cd-form-group'; -import { SharedModule } from '../../../shared/shared.module'; +import { configureTestBed } from '~/testing/unit-test-helper'; +import { CdFormGroup } from '~/app/shared/forms/cd-form-group'; +import { SharedModule } from '~/app/shared/shared.module'; import { IscsiSettingComponent } from './iscsi-setting.component'; describe('IscsiSettingComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-setting/iscsi-setting.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-setting/iscsi-setting.component.ts index ade8ae4c5b2..f27ea2ce7c4 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-setting/iscsi-setting.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-setting/iscsi-setting.component.ts @@ -1,7 +1,7 @@ import { Component, Input, OnInit } from '@angular/core'; import { NgForm, Validators } from '@angular/forms'; -import { CdFormGroup } from '../../../shared/forms/cd-form-group'; +import { CdFormGroup } from '~/app/shared/forms/cd-form-group'; @Component({ selector: 'cd-iscsi-setting', diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-tabs/iscsi-tabs.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-tabs/iscsi-tabs.component.spec.ts index 456c930b0ab..d5332214a4f 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-tabs/iscsi-tabs.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-tabs/iscsi-tabs.component.spec.ts @@ -3,8 +3,8 @@ import { RouterTestingModule } from '@angular/router/testing'; import { NgbNavModule } from '@ng-bootstrap/ng-bootstrap'; -import { configureTestBed } from '../../../../testing/unit-test-helper'; -import { SharedModule } from '../../../shared/shared.module'; +import { configureTestBed } from '~/testing/unit-test-helper'; +import { SharedModule } from '~/app/shared/shared.module'; import { IscsiTabsComponent } from './iscsi-tabs.component'; describe('IscsiTabsComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-details/iscsi-target-details.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-details/iscsi-target-details.component.spec.ts index b33482a2032..6071d2d7eb7 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-details/iscsi-target-details.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-details/iscsi-target-details.component.spec.ts @@ -3,8 +3,8 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { TreeModel, TreeModule } from '@circlon/angular-tree-component'; -import { configureTestBed } from '../../../../testing/unit-test-helper'; -import { SharedModule } from '../../../shared/shared.module'; +import { configureTestBed } from '~/testing/unit-test-helper'; +import { SharedModule } from '~/app/shared/shared.module'; import { IscsiTargetDetailsComponent } from './iscsi-target-details.component'; describe('IscsiTargetDetailsComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-details/iscsi-target-details.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-details/iscsi-target-details.component.ts index d36269b65e4..3840bb3fb97 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-details/iscsi-target-details.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-details/iscsi-target-details.component.ts @@ -9,11 +9,11 @@ import { } from '@circlon/angular-tree-component'; import _ from 'lodash'; -import { TableComponent } from '../../../shared/datatable/table/table.component'; -import { Icons } from '../../../shared/enum/icons.enum'; -import { CdTableColumn } from '../../../shared/models/cd-table-column'; -import { BooleanTextPipe } from '../../../shared/pipes/boolean-text.pipe'; -import { IscsiBackstorePipe } from '../../../shared/pipes/iscsi-backstore.pipe'; +import { TableComponent } from '~/app/shared/datatable/table/table.component'; +import { Icons } from '~/app/shared/enum/icons.enum'; +import { CdTableColumn } from '~/app/shared/models/cd-table-column'; +import { BooleanTextPipe } from '~/app/shared/pipes/boolean-text.pipe'; +import { IscsiBackstorePipe } from '~/app/shared/pipes/iscsi-backstore.pipe'; @Component({ selector: 'cd-iscsi-target-details', diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-discovery-modal/iscsi-target-discovery-modal.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-discovery-modal/iscsi-target-discovery-modal.component.spec.ts index 4f6eec2dd23..78ee23fdeb7 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-discovery-modal/iscsi-target-discovery-modal.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-discovery-modal/iscsi-target-discovery-modal.component.spec.ts @@ -11,9 +11,9 @@ import { RouterTestingModule } from '@angular/router/testing'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { ToastrModule } from 'ngx-toastr'; -import { configureTestBed, FormHelper, IscsiHelper } from '../../../../testing/unit-test-helper'; -import { Permission } from '../../../shared/models/permissions'; -import { SharedModule } from '../../../shared/shared.module'; +import { configureTestBed, FormHelper, IscsiHelper } from '~/testing/unit-test-helper'; +import { Permission } from '~/app/shared/models/permissions'; +import { SharedModule } from '~/app/shared/shared.module'; import { IscsiTargetDiscoveryModalComponent } from './iscsi-target-discovery-modal.component'; describe('IscsiTargetDiscoveryModalComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-discovery-modal/iscsi-target-discovery-modal.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-discovery-modal/iscsi-target-discovery-modal.component.ts index 914d141b01f..fd00db7c142 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-discovery-modal/iscsi-target-discovery-modal.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-discovery-modal/iscsi-target-discovery-modal.component.ts @@ -3,13 +3,13 @@ import { FormControl, Validators } from '@angular/forms'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; -import { IscsiService } from '../../../shared/api/iscsi.service'; -import { NotificationType } from '../../../shared/enum/notification-type.enum'; -import { CdFormGroup } from '../../../shared/forms/cd-form-group'; -import { CdValidators } from '../../../shared/forms/cd-validators'; -import { Permission } from '../../../shared/models/permissions'; -import { AuthStorageService } from '../../../shared/services/auth-storage.service'; -import { NotificationService } from '../../../shared/services/notification.service'; +import { IscsiService } from '~/app/shared/api/iscsi.service'; +import { NotificationType } from '~/app/shared/enum/notification-type.enum'; +import { CdFormGroup } from '~/app/shared/forms/cd-form-group'; +import { CdValidators } from '~/app/shared/forms/cd-validators'; +import { Permission } from '~/app/shared/models/permissions'; +import { AuthStorageService } from '~/app/shared/services/auth-storage.service'; +import { NotificationService } from '~/app/shared/services/notification.service'; @Component({ selector: 'cd-iscsi-target-discovery-modal', diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-form/iscsi-target-form.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-form/iscsi-target-form.component.spec.ts index fb6eef30e8a..83e8fc9284a 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-form/iscsi-target-form.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-form/iscsi-target-form.component.spec.ts @@ -6,11 +6,11 @@ import { RouterTestingModule } from '@angular/router/testing'; import { ToastrModule } from 'ngx-toastr'; -import { ActivatedRouteStub } from '../../../../testing/activated-route-stub'; -import { configureTestBed, FormHelper, IscsiHelper } from '../../../../testing/unit-test-helper'; -import { LoadingPanelComponent } from '../../../shared/components/loading-panel/loading-panel.component'; -import { CdFormGroup } from '../../../shared/forms/cd-form-group'; -import { SharedModule } from '../../../shared/shared.module'; +import { ActivatedRouteStub } from '~/testing/activated-route-stub'; +import { configureTestBed, FormHelper, IscsiHelper } from '~/testing/unit-test-helper'; +import { LoadingPanelComponent } from '~/app/shared/components/loading-panel/loading-panel.component'; +import { CdFormGroup } from '~/app/shared/forms/cd-form-group'; +import { SharedModule } from '~/app/shared/shared.module'; import { IscsiTargetFormComponent } from './iscsi-target-form.component'; describe('IscsiTargetFormComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-form/iscsi-target-form.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-form/iscsi-target-form.component.ts index eefb0bca28f..91b85d5554c 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-form/iscsi-target-form.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-form/iscsi-target-form.component.ts @@ -6,18 +6,18 @@ import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; import _ from 'lodash'; import { forkJoin } from 'rxjs'; -import { IscsiService } from '../../../shared/api/iscsi.service'; -import { RbdService } from '../../../shared/api/rbd.service'; -import { SelectMessages } from '../../../shared/components/select/select-messages.model'; -import { SelectOption } from '../../../shared/components/select/select-option.model'; -import { ActionLabelsI18n } from '../../../shared/constants/app.constants'; -import { Icons } from '../../../shared/enum/icons.enum'; -import { CdForm } from '../../../shared/forms/cd-form'; -import { CdFormGroup } from '../../../shared/forms/cd-form-group'; -import { CdValidators } from '../../../shared/forms/cd-validators'; -import { FinishedTask } from '../../../shared/models/finished-task'; -import { ModalService } from '../../../shared/services/modal.service'; -import { TaskWrapperService } from '../../../shared/services/task-wrapper.service'; +import { IscsiService } from '~/app/shared/api/iscsi.service'; +import { RbdService } from '~/app/shared/api/rbd.service'; +import { SelectMessages } from '~/app/shared/components/select/select-messages.model'; +import { SelectOption } from '~/app/shared/components/select/select-option.model'; +import { ActionLabelsI18n } from '~/app/shared/constants/app.constants'; +import { Icons } from '~/app/shared/enum/icons.enum'; +import { CdForm } from '~/app/shared/forms/cd-form'; +import { CdFormGroup } from '~/app/shared/forms/cd-form-group'; +import { CdValidators } from '~/app/shared/forms/cd-validators'; +import { FinishedTask } from '~/app/shared/models/finished-task'; +import { ModalService } from '~/app/shared/services/modal.service'; +import { TaskWrapperService } from '~/app/shared/services/task-wrapper.service'; import { IscsiTargetImageSettingsModalComponent } from '../iscsi-target-image-settings-modal/iscsi-target-image-settings-modal.component'; import { IscsiTargetIqnSettingsModalComponent } from '../iscsi-target-iqn-settings-modal/iscsi-target-iqn-settings-modal.component'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-image-settings-modal/iscsi-target-image-settings-modal.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-image-settings-modal/iscsi-target-image-settings-modal.component.spec.ts index 60d8513964a..ebd520782d5 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-image-settings-modal/iscsi-target-image-settings-modal.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-image-settings-modal/iscsi-target-image-settings-modal.component.spec.ts @@ -5,8 +5,8 @@ import { RouterTestingModule } from '@angular/router/testing'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; -import { configureTestBed } from '../../../../testing/unit-test-helper'; -import { SharedModule } from '../../../shared/shared.module'; +import { configureTestBed } from '~/testing/unit-test-helper'; +import { SharedModule } from '~/app/shared/shared.module'; import { IscsiSettingComponent } from '../iscsi-setting/iscsi-setting.component'; import { IscsiTargetImageSettingsModalComponent } from './iscsi-target-image-settings-modal.component'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-image-settings-modal/iscsi-target-image-settings-modal.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-image-settings-modal/iscsi-target-image-settings-modal.component.ts index e78194b6429..4521a0db197 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-image-settings-modal/iscsi-target-image-settings-modal.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-image-settings-modal/iscsi-target-image-settings-modal.component.ts @@ -4,8 +4,8 @@ import { AbstractControl, FormControl } from '@angular/forms'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import _ from 'lodash'; -import { IscsiService } from '../../../shared/api/iscsi.service'; -import { CdFormGroup } from '../../../shared/forms/cd-form-group'; +import { IscsiService } from '~/app/shared/api/iscsi.service'; +import { CdFormGroup } from '~/app/shared/forms/cd-form-group'; @Component({ selector: 'cd-iscsi-target-image-settings-modal', diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-iqn-settings-modal/iscsi-target-iqn-settings-modal.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-iqn-settings-modal/iscsi-target-iqn-settings-modal.component.spec.ts index 8e55b78cb4f..27e3f879e5b 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-iqn-settings-modal/iscsi-target-iqn-settings-modal.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-iqn-settings-modal/iscsi-target-iqn-settings-modal.component.spec.ts @@ -5,8 +5,8 @@ import { RouterTestingModule } from '@angular/router/testing'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; -import { configureTestBed } from '../../../../testing/unit-test-helper'; -import { SharedModule } from '../../../shared/shared.module'; +import { configureTestBed } from '~/testing/unit-test-helper'; +import { SharedModule } from '~/app/shared/shared.module'; import { IscsiSettingComponent } from '../iscsi-setting/iscsi-setting.component'; import { IscsiTargetIqnSettingsModalComponent } from './iscsi-target-iqn-settings-modal.component'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-iqn-settings-modal/iscsi-target-iqn-settings-modal.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-iqn-settings-modal/iscsi-target-iqn-settings-modal.component.ts index fae1142d296..4a6ac9df9f4 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-iqn-settings-modal/iscsi-target-iqn-settings-modal.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-iqn-settings-modal/iscsi-target-iqn-settings-modal.component.ts @@ -4,8 +4,8 @@ import { FormControl } from '@angular/forms'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import _ from 'lodash'; -import { IscsiService } from '../../../shared/api/iscsi.service'; -import { CdFormGroup } from '../../../shared/forms/cd-form-group'; +import { IscsiService } from '~/app/shared/api/iscsi.service'; +import { CdFormGroup } from '~/app/shared/forms/cd-form-group'; @Component({ selector: 'cd-iscsi-target-iqn-settings-modal', diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-list/iscsi-target-list.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-list/iscsi-target-list.component.spec.ts index 0e8d740642e..50e4f047076 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-list/iscsi-target-list.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-list/iscsi-target-list.component.spec.ts @@ -12,14 +12,14 @@ import { configureTestBed, expectItemTasks, PermissionHelper -} from '../../../../testing/unit-test-helper'; -import { IscsiService } from '../../../shared/api/iscsi.service'; -import { TableActionsComponent } from '../../../shared/datatable/table-actions/table-actions.component'; -import { CdTableAction } from '../../../shared/models/cd-table-action'; -import { ExecutingTask } from '../../../shared/models/executing-task'; -import { SummaryService } from '../../../shared/services/summary.service'; -import { TaskListService } from '../../../shared/services/task-list.service'; -import { SharedModule } from '../../../shared/shared.module'; +} from '~/testing/unit-test-helper'; +import { IscsiService } from '~/app/shared/api/iscsi.service'; +import { TableActionsComponent } from '~/app/shared/datatable/table-actions/table-actions.component'; +import { CdTableAction } from '~/app/shared/models/cd-table-action'; +import { ExecutingTask } from '~/app/shared/models/executing-task'; +import { SummaryService } from '~/app/shared/services/summary.service'; +import { TaskListService } from '~/app/shared/services/task-list.service'; +import { SharedModule } from '~/app/shared/shared.module'; import { IscsiTabsComponent } from '../iscsi-tabs/iscsi-tabs.component'; import { IscsiTargetDetailsComponent } from '../iscsi-target-details/iscsi-target-details.component'; import { IscsiTargetListComponent } from './iscsi-target-list.component'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-list/iscsi-target-list.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-list/iscsi-target-list.component.ts index a6c82055ac2..96b76d6b749 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-list/iscsi-target-list.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-list/iscsi-target-list.component.ts @@ -4,25 +4,25 @@ import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; import _ from 'lodash'; import { Subscription } from 'rxjs'; -import { IscsiService } from '../../../shared/api/iscsi.service'; -import { ListWithDetails } from '../../../shared/classes/list-with-details.class'; -import { CriticalConfirmationModalComponent } from '../../../shared/components/critical-confirmation-modal/critical-confirmation-modal.component'; -import { ActionLabelsI18n } from '../../../shared/constants/app.constants'; -import { TableComponent } from '../../../shared/datatable/table/table.component'; -import { CellTemplate } from '../../../shared/enum/cell-template.enum'; -import { Icons } from '../../../shared/enum/icons.enum'; -import { CdTableAction } from '../../../shared/models/cd-table-action'; -import { CdTableColumn } from '../../../shared/models/cd-table-column'; -import { CdTableSelection } from '../../../shared/models/cd-table-selection'; -import { FinishedTask } from '../../../shared/models/finished-task'; -import { Permission } from '../../../shared/models/permissions'; -import { Task } from '../../../shared/models/task'; -import { JoinPipe } from '../../../shared/pipes/join.pipe'; -import { NotAvailablePipe } from '../../../shared/pipes/not-available.pipe'; -import { AuthStorageService } from '../../../shared/services/auth-storage.service'; -import { ModalService } from '../../../shared/services/modal.service'; -import { TaskListService } from '../../../shared/services/task-list.service'; -import { TaskWrapperService } from '../../../shared/services/task-wrapper.service'; +import { IscsiService } from '~/app/shared/api/iscsi.service'; +import { ListWithDetails } from '~/app/shared/classes/list-with-details.class'; +import { CriticalConfirmationModalComponent } from '~/app/shared/components/critical-confirmation-modal/critical-confirmation-modal.component'; +import { ActionLabelsI18n } from '~/app/shared/constants/app.constants'; +import { TableComponent } from '~/app/shared/datatable/table/table.component'; +import { CellTemplate } from '~/app/shared/enum/cell-template.enum'; +import { Icons } from '~/app/shared/enum/icons.enum'; +import { CdTableAction } from '~/app/shared/models/cd-table-action'; +import { CdTableColumn } from '~/app/shared/models/cd-table-column'; +import { CdTableSelection } from '~/app/shared/models/cd-table-selection'; +import { FinishedTask } from '~/app/shared/models/finished-task'; +import { Permission } from '~/app/shared/models/permissions'; +import { Task } from '~/app/shared/models/task'; +import { JoinPipe } from '~/app/shared/pipes/join.pipe'; +import { NotAvailablePipe } from '~/app/shared/pipes/not-available.pipe'; +import { AuthStorageService } from '~/app/shared/services/auth-storage.service'; +import { ModalService } from '~/app/shared/services/modal.service'; +import { TaskListService } from '~/app/shared/services/task-list.service'; +import { TaskWrapperService } from '~/app/shared/services/task-wrapper.service'; import { IscsiTargetDiscoveryModalComponent } from '../iscsi-target-discovery-modal/iscsi-target-discovery-modal.component'; @Component({ diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi/iscsi.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi/iscsi.component.spec.ts index c081b7c31e8..dc230667ee7 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi/iscsi.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi/iscsi.component.spec.ts @@ -4,13 +4,13 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { of } from 'rxjs'; -import { configureTestBed } from '../../../../testing/unit-test-helper'; -import { IscsiService } from '../../../shared/api/iscsi.service'; -import { CephShortVersionPipe } from '../../../shared/pipes/ceph-short-version.pipe'; -import { DimlessPipe } from '../../../shared/pipes/dimless.pipe'; -import { IscsiBackstorePipe } from '../../../shared/pipes/iscsi-backstore.pipe'; -import { FormatterService } from '../../../shared/services/formatter.service'; -import { SharedModule } from '../../../shared/shared.module'; +import { configureTestBed } from '~/testing/unit-test-helper'; +import { IscsiService } from '~/app/shared/api/iscsi.service'; +import { CephShortVersionPipe } from '~/app/shared/pipes/ceph-short-version.pipe'; +import { DimlessPipe } from '~/app/shared/pipes/dimless.pipe'; +import { IscsiBackstorePipe } from '~/app/shared/pipes/iscsi-backstore.pipe'; +import { FormatterService } from '~/app/shared/services/formatter.service'; +import { SharedModule } from '~/app/shared/shared.module'; import { IscsiComponent } from './iscsi.component'; describe('IscsiComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi/iscsi.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi/iscsi.component.ts index b3a6d0c6926..89e4d7f3407 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi/iscsi.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi/iscsi.component.ts @@ -1,9 +1,9 @@ import { Component, OnInit, TemplateRef, ViewChild } from '@angular/core'; -import { IscsiService } from '../../../shared/api/iscsi.service'; -import { CellTemplate } from '../../../shared/enum/cell-template.enum'; -import { DimlessPipe } from '../../../shared/pipes/dimless.pipe'; -import { IscsiBackstorePipe } from '../../../shared/pipes/iscsi-backstore.pipe'; +import { IscsiService } from '~/app/shared/api/iscsi.service'; +import { CellTemplate } from '~/app/shared/enum/cell-template.enum'; +import { DimlessPipe } from '~/app/shared/pipes/dimless.pipe'; +import { IscsiBackstorePipe } from '~/app/shared/pipes/iscsi-backstore.pipe'; @Component({ selector: 'cd-iscsi', diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/bootstrap-create-modal/bootstrap-create-modal.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/bootstrap-create-modal/bootstrap-create-modal.component.spec.ts index a03c6aae5e0..d8ced4a66f8 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/bootstrap-create-modal/bootstrap-create-modal.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/bootstrap-create-modal/bootstrap-create-modal.component.spec.ts @@ -7,10 +7,10 @@ import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { ToastrModule } from 'ngx-toastr'; import { of } from 'rxjs'; -import { configureTestBed, FormHelper } from '../../../../../testing/unit-test-helper'; -import { RbdMirroringService } from '../../../../shared/api/rbd-mirroring.service'; -import { NotificationService } from '../../../../shared/services/notification.service'; -import { SharedModule } from '../../../../shared/shared.module'; +import { configureTestBed, FormHelper } from '~/testing/unit-test-helper'; +import { RbdMirroringService } from '~/app/shared/api/rbd-mirroring.service'; +import { NotificationService } from '~/app/shared/services/notification.service'; +import { SharedModule } from '~/app/shared/shared.module'; import { BootstrapCreateModalComponent } from './bootstrap-create-modal.component'; describe('BootstrapCreateModalComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/bootstrap-create-modal/bootstrap-create-modal.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/bootstrap-create-modal/bootstrap-create-modal.component.ts index fba654f366e..6e6bc64aba9 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/bootstrap-create-modal/bootstrap-create-modal.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/bootstrap-create-modal/bootstrap-create-modal.component.ts @@ -6,11 +6,11 @@ import _ from 'lodash'; import { concat, forkJoin, Subscription } from 'rxjs'; import { last, tap } from 'rxjs/operators'; -import { RbdMirroringService } from '../../../../shared/api/rbd-mirroring.service'; -import { CdFormGroup } from '../../../../shared/forms/cd-form-group'; -import { FinishedTask } from '../../../../shared/models/finished-task'; -import { TaskWrapperService } from '../../../../shared/services/task-wrapper.service'; -import { Pool } from '../../../pool/pool'; +import { RbdMirroringService } from '~/app/shared/api/rbd-mirroring.service'; +import { CdFormGroup } from '~/app/shared/forms/cd-form-group'; +import { FinishedTask } from '~/app/shared/models/finished-task'; +import { TaskWrapperService } from '~/app/shared/services/task-wrapper.service'; +import { Pool } from '~/app/ceph/pool/pool'; @Component({ selector: 'cd-bootstrap-create-modal', diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/bootstrap-import-modal/bootstrap-import-modal.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/bootstrap-import-modal/bootstrap-import-modal.component.spec.ts index e0b829d6072..5acf9109754 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/bootstrap-import-modal/bootstrap-import-modal.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/bootstrap-import-modal/bootstrap-import-modal.component.spec.ts @@ -7,10 +7,10 @@ import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { ToastrModule } from 'ngx-toastr'; import { of } from 'rxjs'; -import { configureTestBed, FormHelper } from '../../../../../testing/unit-test-helper'; -import { RbdMirroringService } from '../../../../shared/api/rbd-mirroring.service'; -import { NotificationService } from '../../../../shared/services/notification.service'; -import { SharedModule } from '../../../../shared/shared.module'; +import { configureTestBed, FormHelper } from '~/testing/unit-test-helper'; +import { RbdMirroringService } from '~/app/shared/api/rbd-mirroring.service'; +import { NotificationService } from '~/app/shared/services/notification.service'; +import { SharedModule } from '~/app/shared/shared.module'; import { BootstrapImportModalComponent } from './bootstrap-import-modal.component'; describe('BootstrapImportModalComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/bootstrap-import-modal/bootstrap-import-modal.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/bootstrap-import-modal/bootstrap-import-modal.component.ts index ee58c365786..dc49c1c1d61 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/bootstrap-import-modal/bootstrap-import-modal.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/bootstrap-import-modal/bootstrap-import-modal.component.ts @@ -6,11 +6,11 @@ import _ from 'lodash'; import { concat, forkJoin, Observable, Subscription } from 'rxjs'; import { last } from 'rxjs/operators'; -import { RbdMirroringService } from '../../../../shared/api/rbd-mirroring.service'; -import { CdFormGroup } from '../../../../shared/forms/cd-form-group'; -import { FinishedTask } from '../../../../shared/models/finished-task'; -import { TaskWrapperService } from '../../../../shared/services/task-wrapper.service'; -import { Pool } from '../../../pool/pool'; +import { RbdMirroringService } from '~/app/shared/api/rbd-mirroring.service'; +import { CdFormGroup } from '~/app/shared/forms/cd-form-group'; +import { FinishedTask } from '~/app/shared/models/finished-task'; +import { TaskWrapperService } from '~/app/shared/services/task-wrapper.service'; +import { Pool } from '~/app/ceph/pool/pool'; @Component({ selector: 'cd-bootstrap-import-modal', diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/daemon-list/daemon-list.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/daemon-list/daemon-list.component.spec.ts index 5dc7855e52a..4009554ebcd 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/daemon-list/daemon-list.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/daemon-list/daemon-list.component.spec.ts @@ -2,8 +2,8 @@ import { HttpClientTestingModule } from '@angular/common/http/testing'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -import { configureTestBed } from '../../../../../testing/unit-test-helper'; -import { SharedModule } from '../../../../shared/shared.module'; +import { configureTestBed } from '~/testing/unit-test-helper'; +import { SharedModule } from '~/app/shared/shared.module'; import { MirrorHealthColorPipe } from '../mirror-health-color.pipe'; import { DaemonListComponent } from './daemon-list.component'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/daemon-list/daemon-list.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/daemon-list/daemon-list.component.ts index e49a895d87d..d5519700354 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/daemon-list/daemon-list.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/daemon-list/daemon-list.component.ts @@ -2,9 +2,9 @@ import { Component, OnDestroy, OnInit, TemplateRef, ViewChild } from '@angular/c import { Subscription } from 'rxjs'; -import { RbdMirroringService } from '../../../../shared/api/rbd-mirroring.service'; -import { TableStatusViewCache } from '../../../../shared/classes/table-status-view-cache'; -import { CephShortVersionPipe } from '../../../../shared/pipes/ceph-short-version.pipe'; +import { RbdMirroringService } from '~/app/shared/api/rbd-mirroring.service'; +import { TableStatusViewCache } from '~/app/shared/classes/table-status-view-cache'; +import { CephShortVersionPipe } from '~/app/shared/pipes/ceph-short-version.pipe'; @Component({ selector: 'cd-mirroring-daemons', diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/edit-site-name-modal/edit-site-name-modal.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/edit-site-name-modal/edit-site-name-modal.component.spec.ts index 4ac1bc3886c..3ef9144a89e 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/edit-site-name-modal/edit-site-name-modal.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/edit-site-name-modal/edit-site-name-modal.component.spec.ts @@ -7,10 +7,10 @@ import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { ToastrModule } from 'ngx-toastr'; import { of } from 'rxjs'; -import { configureTestBed } from '../../../../../testing/unit-test-helper'; -import { RbdMirroringService } from '../../../../shared/api/rbd-mirroring.service'; -import { NotificationService } from '../../../../shared/services/notification.service'; -import { SharedModule } from '../../../../shared/shared.module'; +import { configureTestBed } from '~/testing/unit-test-helper'; +import { RbdMirroringService } from '~/app/shared/api/rbd-mirroring.service'; +import { NotificationService } from '~/app/shared/services/notification.service'; +import { SharedModule } from '~/app/shared/shared.module'; import { EditSiteNameModalComponent } from './edit-site-name-modal.component'; describe('EditSiteNameModalComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/edit-site-name-modal/edit-site-name-modal.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/edit-site-name-modal/edit-site-name-modal.component.ts index 7ddbbaad469..71c41a1267a 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/edit-site-name-modal/edit-site-name-modal.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/edit-site-name-modal/edit-site-name-modal.component.ts @@ -3,10 +3,10 @@ import { FormControl } from '@angular/forms'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; -import { RbdMirroringService } from '../../../../shared/api/rbd-mirroring.service'; -import { CdFormGroup } from '../../../../shared/forms/cd-form-group'; -import { FinishedTask } from '../../../../shared/models/finished-task'; -import { TaskWrapperService } from '../../../../shared/services/task-wrapper.service'; +import { RbdMirroringService } from '~/app/shared/api/rbd-mirroring.service'; +import { CdFormGroup } from '~/app/shared/forms/cd-form-group'; +import { FinishedTask } from '~/app/shared/models/finished-task'; +import { TaskWrapperService } from '~/app/shared/services/task-wrapper.service'; @Component({ selector: 'cd-edit-site-mode-modal', diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/image-list/image-list.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/image-list/image-list.component.spec.ts index 75a6c0c1425..c46da43a221 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/image-list/image-list.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/image-list/image-list.component.spec.ts @@ -4,8 +4,8 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { NgbNavModule, NgbProgressbarModule } from '@ng-bootstrap/ng-bootstrap'; -import { configureTestBed } from '../../../../../testing/unit-test-helper'; -import { SharedModule } from '../../../../shared/shared.module'; +import { configureTestBed } from '~/testing/unit-test-helper'; +import { SharedModule } from '~/app/shared/shared.module'; import { MirrorHealthColorPipe } from '../mirror-health-color.pipe'; import { ImageListComponent } from './image-list.component'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/image-list/image-list.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/image-list/image-list.component.ts index 75744e3937b..015031ebeeb 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/image-list/image-list.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/image-list/image-list.component.ts @@ -2,8 +2,8 @@ import { Component, OnDestroy, OnInit, TemplateRef, ViewChild } from '@angular/c import { Subscription } from 'rxjs'; -import { RbdMirroringService } from '../../../../shared/api/rbd-mirroring.service'; -import { TableStatusViewCache } from '../../../../shared/classes/table-status-view-cache'; +import { RbdMirroringService } from '~/app/shared/api/rbd-mirroring.service'; +import { TableStatusViewCache } from '~/app/shared/classes/table-status-view-cache'; @Component({ selector: 'cd-mirroring-images', diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/mirroring.module.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/mirroring.module.ts index 4d2fc4b3304..0edea02494c 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/mirroring.module.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/mirroring.module.ts @@ -5,7 +5,7 @@ import { RouterModule } from '@angular/router'; import { NgbNavModule, NgbProgressbarModule } from '@ng-bootstrap/ng-bootstrap'; -import { SharedModule } from '../../../shared/shared.module'; +import { SharedModule } from '~/app/shared/shared.module'; import { BootstrapCreateModalComponent } from './bootstrap-create-modal/bootstrap-create-modal.component'; import { BootstrapImportModalComponent } from './bootstrap-import-modal/bootstrap-import-modal.component'; import { DaemonListComponent } from './daemon-list/daemon-list.component'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/overview/overview.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/overview/overview.component.spec.ts index 486f3a89c78..9f0de47b711 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/overview/overview.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/overview/overview.component.spec.ts @@ -6,8 +6,8 @@ import { RouterTestingModule } from '@angular/router/testing'; import { NgbNavModule, NgbProgressbarModule } from '@ng-bootstrap/ng-bootstrap'; import { ToastrModule } from 'ngx-toastr'; -import { configureTestBed } from '../../../../../testing/unit-test-helper'; -import { SharedModule } from '../../../../shared/shared.module'; +import { configureTestBed } from '~/testing/unit-test-helper'; +import { SharedModule } from '~/app/shared/shared.module'; import { DaemonListComponent } from '../daemon-list/daemon-list.component'; import { ImageListComponent } from '../image-list/image-list.component'; import { MirrorHealthColorPipe } from '../mirror-health-color.pipe'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/overview/overview.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/overview/overview.component.ts index 02f7fee878e..5f21b47534b 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/overview/overview.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/overview/overview.component.ts @@ -3,15 +3,15 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; import { Subscription } from 'rxjs'; -import { RbdMirroringService } from '../../../../shared/api/rbd-mirroring.service'; -import { Icons } from '../../../../shared/enum/icons.enum'; -import { ViewCacheStatus } from '../../../../shared/enum/view-cache-status.enum'; -import { CdTableAction } from '../../../../shared/models/cd-table-action'; -import { CdTableSelection } from '../../../../shared/models/cd-table-selection'; -import { Permission } from '../../../../shared/models/permissions'; -import { AuthStorageService } from '../../../../shared/services/auth-storage.service'; -import { ModalService } from '../../../../shared/services/modal.service'; -import { Pool } from '../../../pool/pool'; +import { RbdMirroringService } from '~/app/shared/api/rbd-mirroring.service'; +import { Icons } from '~/app/shared/enum/icons.enum'; +import { ViewCacheStatus } from '~/app/shared/enum/view-cache-status.enum'; +import { CdTableAction } from '~/app/shared/models/cd-table-action'; +import { CdTableSelection } from '~/app/shared/models/cd-table-selection'; +import { Permission } from '~/app/shared/models/permissions'; +import { AuthStorageService } from '~/app/shared/services/auth-storage.service'; +import { ModalService } from '~/app/shared/services/modal.service'; +import { Pool } from '~/app/ceph/pool/pool'; import { BootstrapCreateModalComponent } from '../bootstrap-create-modal/bootstrap-create-modal.component'; import { BootstrapImportModalComponent } from '../bootstrap-import-modal/bootstrap-import-modal.component'; import { EditSiteNameModalComponent } from '../edit-site-name-modal/edit-site-name-modal.component'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/pool-edit-mode-modal/pool-edit-mode-modal.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/pool-edit-mode-modal/pool-edit-mode-modal.component.spec.ts index b5c37ea5f7b..34097ce9948 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/pool-edit-mode-modal/pool-edit-mode-modal.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/pool-edit-mode-modal/pool-edit-mode-modal.component.spec.ts @@ -7,10 +7,10 @@ import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { ToastrModule } from 'ngx-toastr'; import { of } from 'rxjs'; -import { configureTestBed, FormHelper } from '../../../../../testing/unit-test-helper'; -import { RbdMirroringService } from '../../../../shared/api/rbd-mirroring.service'; -import { NotificationService } from '../../../../shared/services/notification.service'; -import { SharedModule } from '../../../../shared/shared.module'; +import { configureTestBed, FormHelper } from '~/testing/unit-test-helper'; +import { RbdMirroringService } from '~/app/shared/api/rbd-mirroring.service'; +import { NotificationService } from '~/app/shared/services/notification.service'; +import { SharedModule } from '~/app/shared/shared.module'; import { PoolEditModeModalComponent } from './pool-edit-mode-modal.component'; describe('PoolEditModeModalComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/pool-edit-mode-modal/pool-edit-mode-modal.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/pool-edit-mode-modal/pool-edit-mode-modal.component.ts index 696d12d72b4..f435e84b75f 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/pool-edit-mode-modal/pool-edit-mode-modal.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/pool-edit-mode-modal/pool-edit-mode-modal.component.ts @@ -4,10 +4,10 @@ import { AbstractControl, FormControl, Validators } from '@angular/forms'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { Subscription } from 'rxjs'; -import { RbdMirroringService } from '../../../../shared/api/rbd-mirroring.service'; -import { CdFormGroup } from '../../../../shared/forms/cd-form-group'; -import { FinishedTask } from '../../../../shared/models/finished-task'; -import { TaskWrapperService } from '../../../../shared/services/task-wrapper.service'; +import { RbdMirroringService } from '~/app/shared/api/rbd-mirroring.service'; +import { CdFormGroup } from '~/app/shared/forms/cd-form-group'; +import { FinishedTask } from '~/app/shared/models/finished-task'; +import { TaskWrapperService } from '~/app/shared/services/task-wrapper.service'; import { PoolEditModeResponseModel } from './pool-edit-mode-response.model'; @Component({ diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/pool-edit-peer-modal/pool-edit-peer-modal.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/pool-edit-peer-modal/pool-edit-peer-modal.component.spec.ts index 6a4db9aa6a7..13dd5ca5716 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/pool-edit-peer-modal/pool-edit-peer-modal.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/pool-edit-peer-modal/pool-edit-peer-modal.component.spec.ts @@ -7,10 +7,10 @@ import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { ToastrModule } from 'ngx-toastr'; import { of } from 'rxjs'; -import { configureTestBed, FormHelper } from '../../../../../testing/unit-test-helper'; -import { RbdMirroringService } from '../../../../shared/api/rbd-mirroring.service'; -import { NotificationService } from '../../../../shared/services/notification.service'; -import { SharedModule } from '../../../../shared/shared.module'; +import { configureTestBed, FormHelper } from '~/testing/unit-test-helper'; +import { RbdMirroringService } from '~/app/shared/api/rbd-mirroring.service'; +import { NotificationService } from '~/app/shared/services/notification.service'; +import { SharedModule } from '~/app/shared/shared.module'; import { PoolEditPeerModalComponent } from './pool-edit-peer-modal.component'; import { PoolEditPeerResponseModel } from './pool-edit-peer-response.model'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/pool-edit-peer-modal/pool-edit-peer-modal.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/pool-edit-peer-modal/pool-edit-peer-modal.component.ts index 56a38656af7..83f1fe89769 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/pool-edit-peer-modal/pool-edit-peer-modal.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/pool-edit-peer-modal/pool-edit-peer-modal.component.ts @@ -3,10 +3,10 @@ import { AbstractControl, FormControl, Validators } from '@angular/forms'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; -import { RbdMirroringService } from '../../../../shared/api/rbd-mirroring.service'; -import { CdFormGroup } from '../../../../shared/forms/cd-form-group'; -import { FinishedTask } from '../../../../shared/models/finished-task'; -import { TaskWrapperService } from '../../../../shared/services/task-wrapper.service'; +import { RbdMirroringService } from '~/app/shared/api/rbd-mirroring.service'; +import { CdFormGroup } from '~/app/shared/forms/cd-form-group'; +import { FinishedTask } from '~/app/shared/models/finished-task'; +import { TaskWrapperService } from '~/app/shared/services/task-wrapper.service'; import { PoolEditPeerResponseModel } from './pool-edit-peer-response.model'; @Component({ diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/pool-list/pool-list.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/pool-list/pool-list.component.spec.ts index 26a8f333e14..9957d80314d 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/pool-list/pool-list.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/pool-list/pool-list.component.spec.ts @@ -5,8 +5,8 @@ import { RouterTestingModule } from '@angular/router/testing'; import { ToastrModule } from 'ngx-toastr'; -import { configureTestBed } from '../../../../../testing/unit-test-helper'; -import { SharedModule } from '../../../../shared/shared.module'; +import { configureTestBed } from '~/testing/unit-test-helper'; +import { SharedModule } from '~/app/shared/shared.module'; import { MirrorHealthColorPipe } from '../mirror-health-color.pipe'; import { PoolListComponent } from './pool-list.component'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/pool-list/pool-list.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/pool-list/pool-list.component.ts index 356927ea8f4..29b435900df 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/pool-list/pool-list.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/pool-list/pool-list.component.ts @@ -3,17 +3,17 @@ import { Component, OnDestroy, OnInit, TemplateRef, ViewChild } from '@angular/c import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; import { Observable, Subscriber, Subscription } from 'rxjs'; -import { RbdMirroringService } from '../../../../shared/api/rbd-mirroring.service'; -import { TableStatusViewCache } from '../../../../shared/classes/table-status-view-cache'; -import { CriticalConfirmationModalComponent } from '../../../../shared/components/critical-confirmation-modal/critical-confirmation-modal.component'; -import { Icons } from '../../../../shared/enum/icons.enum'; -import { CdTableAction } from '../../../../shared/models/cd-table-action'; -import { CdTableSelection } from '../../../../shared/models/cd-table-selection'; -import { FinishedTask } from '../../../../shared/models/finished-task'; -import { Permission } from '../../../../shared/models/permissions'; -import { AuthStorageService } from '../../../../shared/services/auth-storage.service'; -import { ModalService } from '../../../../shared/services/modal.service'; -import { TaskWrapperService } from '../../../../shared/services/task-wrapper.service'; +import { RbdMirroringService } from '~/app/shared/api/rbd-mirroring.service'; +import { TableStatusViewCache } from '~/app/shared/classes/table-status-view-cache'; +import { CriticalConfirmationModalComponent } from '~/app/shared/components/critical-confirmation-modal/critical-confirmation-modal.component'; +import { Icons } from '~/app/shared/enum/icons.enum'; +import { CdTableAction } from '~/app/shared/models/cd-table-action'; +import { CdTableSelection } from '~/app/shared/models/cd-table-selection'; +import { FinishedTask } from '~/app/shared/models/finished-task'; +import { Permission } from '~/app/shared/models/permissions'; +import { AuthStorageService } from '~/app/shared/services/auth-storage.service'; +import { ModalService } from '~/app/shared/services/modal.service'; +import { TaskWrapperService } from '~/app/shared/services/task-wrapper.service'; import { PoolEditModeModalComponent } from '../pool-edit-mode-modal/pool-edit-mode-modal.component'; import { PoolEditPeerModalComponent } from '../pool-edit-peer-modal/pool-edit-peer-modal.component'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-configuration-form/rbd-configuration-form.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-configuration-form/rbd-configuration-form.component.spec.ts index 0f0daa6b9df..3d3ee1f8bb0 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-configuration-form/rbd-configuration-form.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-configuration-form/rbd-configuration-form.component.spec.ts @@ -3,14 +3,14 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ReactiveFormsModule } from '@angular/forms'; import { By } from '@angular/platform-browser'; -import { configureTestBed, FormHelper } from '../../../../testing/unit-test-helper'; -import { DirectivesModule } from '../../../shared/directives/directives.module'; -import { CdFormGroup } from '../../../shared/forms/cd-form-group'; -import { RbdConfigurationSourceField } from '../../../shared/models/configuration'; -import { DimlessBinaryPerSecondPipe } from '../../../shared/pipes/dimless-binary-per-second.pipe'; -import { FormatterService } from '../../../shared/services/formatter.service'; -import { RbdConfigurationService } from '../../../shared/services/rbd-configuration.service'; -import { SharedModule } from '../../../shared/shared.module'; +import { configureTestBed, FormHelper } from '~/testing/unit-test-helper'; +import { DirectivesModule } from '~/app/shared/directives/directives.module'; +import { CdFormGroup } from '~/app/shared/forms/cd-form-group'; +import { RbdConfigurationSourceField } from '~/app/shared/models/configuration'; +import { DimlessBinaryPerSecondPipe } from '~/app/shared/pipes/dimless-binary-per-second.pipe'; +import { FormatterService } from '~/app/shared/services/formatter.service'; +import { RbdConfigurationService } from '~/app/shared/services/rbd-configuration.service'; +import { SharedModule } from '~/app/shared/shared.module'; import { RbdConfigurationFormComponent } from './rbd-configuration-form.component'; describe('RbdConfigurationFormComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-configuration-form/rbd-configuration-form.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-configuration-form/rbd-configuration-form.component.ts index 67c64117359..5c282118c9b 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-configuration-form/rbd-configuration-form.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-configuration-form/rbd-configuration-form.component.ts @@ -1,15 +1,15 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { FormControl, Validators } from '@angular/forms'; -import { Icons } from '../../../shared/enum/icons.enum'; -import { CdFormGroup } from '../../../shared/forms/cd-form-group'; +import { Icons } from '~/app/shared/enum/icons.enum'; +import { CdFormGroup } from '~/app/shared/forms/cd-form-group'; import { RbdConfigurationEntry, RbdConfigurationSourceField, RbdConfigurationType -} from '../../../shared/models/configuration'; -import { FormatterService } from '../../../shared/services/formatter.service'; -import { RbdConfigurationService } from '../../../shared/services/rbd-configuration.service'; +} from '~/app/shared/models/configuration'; +import { FormatterService } from '~/app/shared/services/formatter.service'; +import { RbdConfigurationService } from '~/app/shared/services/rbd-configuration.service'; @Component({ selector: 'cd-rbd-configuration-form', diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-configuration-list/rbd-configuration-list.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-configuration-list/rbd-configuration-list.component.spec.ts index a0b9148596a..c3ead8de9c5 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-configuration-list/rbd-configuration-list.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-configuration-list/rbd-configuration-list.component.spec.ts @@ -7,13 +7,13 @@ import { NgbDropdownModule, NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap' import { NgxDatatableModule } from '@swimlane/ngx-datatable'; import { ChartsModule } from 'ng2-charts'; -import { configureTestBed } from '../../../../testing/unit-test-helper'; -import { ComponentsModule } from '../../../shared/components/components.module'; -import { TableComponent } from '../../../shared/datatable/table/table.component'; -import { RbdConfigurationEntry } from '../../../shared/models/configuration'; -import { PipesModule } from '../../../shared/pipes/pipes.module'; -import { FormatterService } from '../../../shared/services/formatter.service'; -import { RbdConfigurationService } from '../../../shared/services/rbd-configuration.service'; +import { configureTestBed } from '~/testing/unit-test-helper'; +import { ComponentsModule } from '~/app/shared/components/components.module'; +import { TableComponent } from '~/app/shared/datatable/table/table.component'; +import { RbdConfigurationEntry } from '~/app/shared/models/configuration'; +import { PipesModule } from '~/app/shared/pipes/pipes.module'; +import { FormatterService } from '~/app/shared/services/formatter.service'; +import { RbdConfigurationService } from '~/app/shared/services/rbd-configuration.service'; import { RbdConfigurationListComponent } from './rbd-configuration-list.component'; describe('RbdConfigurationListComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-configuration-list/rbd-configuration-list.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-configuration-list/rbd-configuration-list.component.ts index 1e21a193dc2..84fa02ff980 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-configuration-list/rbd-configuration-list.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-configuration-list/rbd-configuration-list.component.ts @@ -1,15 +1,15 @@ import { Component, Input, OnChanges, OnInit, TemplateRef, ViewChild } from '@angular/core'; -import { TableComponent } from '../../../shared/datatable/table/table.component'; -import { CdTableColumn } from '../../../shared/models/cd-table-column'; +import { TableComponent } from '~/app/shared/datatable/table/table.component'; +import { CdTableColumn } from '~/app/shared/models/cd-table-column'; import { RbdConfigurationEntry, RbdConfigurationSourceField, RbdConfigurationType -} from '../../../shared/models/configuration'; -import { RbdConfigurationSourcePipe } from '../../../shared/pipes/rbd-configuration-source.pipe'; -import { FormatterService } from '../../../shared/services/formatter.service'; -import { RbdConfigurationService } from '../../../shared/services/rbd-configuration.service'; +} from '~/app/shared/models/configuration'; +import { RbdConfigurationSourcePipe } from '~/app/shared/pipes/rbd-configuration-source.pipe'; +import { FormatterService } from '~/app/shared/services/formatter.service'; +import { RbdConfigurationService } from '~/app/shared/services/rbd-configuration.service'; @Component({ selector: 'cd-rbd-configuration-table', diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-details/rbd-details.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-details/rbd-details.component.spec.ts index 409fe50d14e..b722704fb64 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-details/rbd-details.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-details/rbd-details.component.spec.ts @@ -3,8 +3,8 @@ import { RouterTestingModule } from '@angular/router/testing'; import { NgbNavModule, NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap'; -import { configureTestBed } from '../../../../testing/unit-test-helper'; -import { SharedModule } from '../../../shared/shared.module'; +import { configureTestBed } from '~/testing/unit-test-helper'; +import { SharedModule } from '~/app/shared/shared.module'; import { RbdConfigurationListComponent } from '../rbd-configuration-list/rbd-configuration-list.component'; import { RbdSnapshotListComponent } from '../rbd-snapshot-list/rbd-snapshot-list.component'; import { RbdDetailsComponent } from './rbd-details.component'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-form/rbd-form-clone-request.model.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-form/rbd-form-clone-request.model.ts index 0666d8c5d40..fa190c0d5cb 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-form/rbd-form-clone-request.model.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-form/rbd-form-clone-request.model.ts @@ -1,4 +1,4 @@ -import { RbdConfigurationEntry } from '../../../shared/models/configuration'; +import { RbdConfigurationEntry } from '~/app/shared/models/configuration'; export class RbdFormCloneRequestModel { child_pool_name: string; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-form/rbd-form-copy-request.model.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-form/rbd-form-copy-request.model.ts index 6642237f144..af86234afdd 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-form/rbd-form-copy-request.model.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-form/rbd-form-copy-request.model.ts @@ -1,4 +1,4 @@ -import { RbdConfigurationEntry } from '../../../shared/models/configuration'; +import { RbdConfigurationEntry } from '~/app/shared/models/configuration'; export class RbdFormCopyRequestModel { dest_pool_name: string; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-form/rbd-form-edit-request.model.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-form/rbd-form-edit-request.model.ts index 37997e22d7d..9187b024d9d 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-form/rbd-form-edit-request.model.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-form/rbd-form-edit-request.model.ts @@ -1,4 +1,4 @@ -import { RbdConfigurationEntry } from '../../../shared/models/configuration'; +import { RbdConfigurationEntry } from '~/app/shared/models/configuration'; export class RbdFormEditRequestModel { name: string; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-form/rbd-form.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-form/rbd-form.component.spec.ts index dad872435d0..1db29f377e5 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-form/rbd-form.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-form/rbd-form.component.spec.ts @@ -9,13 +9,13 @@ import { ToastrModule } from 'ngx-toastr'; import { NEVER, of } from 'rxjs'; import { delay } from 'rxjs/operators'; -import { ActivatedRouteStub } from '../../../../testing/activated-route-stub'; -import { configureTestBed } from '../../../../testing/unit-test-helper'; -import { PoolService } from '../../../shared/api/pool.service'; -import { RbdService } from '../../../shared/api/rbd.service'; -import { ImageSpec } from '../../../shared/models/image-spec'; -import { SharedModule } from '../../../shared/shared.module'; -import { Pool } from '../../pool/pool'; +import { ActivatedRouteStub } from '~/testing/activated-route-stub'; +import { configureTestBed } from '~/testing/unit-test-helper'; +import { PoolService } from '~/app/shared/api/pool.service'; +import { RbdService } from '~/app/shared/api/rbd.service'; +import { ImageSpec } from '~/app/shared/models/image-spec'; +import { SharedModule } from '~/app/shared/shared.module'; +import { Pool } from '~/app/ceph/pool/pool'; import { RbdConfigurationFormComponent } from '../rbd-configuration-form/rbd-configuration-form.component'; import { RbdImageFeature } from './rbd-feature.interface'; import { RbdFormMode } from './rbd-form-mode.enum'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-form/rbd-form.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-form/rbd-form.component.ts index eec514bec79..8becd4b62e1 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-form/rbd-form.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-form/rbd-form.component.ts @@ -6,24 +6,24 @@ import _ from 'lodash'; import { forkJoin, Observable, ReplaySubject } from 'rxjs'; import { first, switchMap } from 'rxjs/operators'; -import { PoolService } from '../../../shared/api/pool.service'; -import { RbdService } from '../../../shared/api/rbd.service'; -import { ActionLabelsI18n } from '../../../shared/constants/app.constants'; -import { Icons } from '../../../shared/enum/icons.enum'; -import { CdForm } from '../../../shared/forms/cd-form'; -import { CdFormGroup } from '../../../shared/forms/cd-form-group'; +import { PoolService } from '~/app/shared/api/pool.service'; +import { RbdService } from '~/app/shared/api/rbd.service'; +import { ActionLabelsI18n } from '~/app/shared/constants/app.constants'; +import { Icons } from '~/app/shared/enum/icons.enum'; +import { CdForm } from '~/app/shared/forms/cd-form'; +import { CdFormGroup } from '~/app/shared/forms/cd-form-group'; import { RbdConfigurationEntry, RbdConfigurationSourceField -} from '../../../shared/models/configuration'; -import { FinishedTask } from '../../../shared/models/finished-task'; -import { ImageSpec } from '../../../shared/models/image-spec'; -import { Permission } from '../../../shared/models/permissions'; -import { DimlessBinaryPipe } from '../../../shared/pipes/dimless-binary.pipe'; -import { AuthStorageService } from '../../../shared/services/auth-storage.service'; -import { FormatterService } from '../../../shared/services/formatter.service'; -import { TaskWrapperService } from '../../../shared/services/task-wrapper.service'; -import { Pool } from '../../pool/pool'; +} from '~/app/shared/models/configuration'; +import { FinishedTask } from '~/app/shared/models/finished-task'; +import { ImageSpec } from '~/app/shared/models/image-spec'; +import { Permission } from '~/app/shared/models/permissions'; +import { DimlessBinaryPipe } from '~/app/shared/pipes/dimless-binary.pipe'; +import { AuthStorageService } from '~/app/shared/services/auth-storage.service'; +import { FormatterService } from '~/app/shared/services/formatter.service'; +import { TaskWrapperService } from '~/app/shared/services/task-wrapper.service'; +import { Pool } from '~/app/ceph/pool/pool'; import { RBDImageFormat, RbdModel } from '../rbd-list/rbd-model'; import { RbdImageFeature } from './rbd-feature.interface'; import { RbdFormCloneRequestModel } from './rbd-form-clone-request.model'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-form/rbd-form.model.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-form/rbd-form.model.ts index 6a4999d0fc5..785fec2cc2f 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-form/rbd-form.model.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-form/rbd-form.model.ts @@ -1,4 +1,4 @@ -import { RbdConfigurationEntry } from '../../../shared/models/configuration'; +import { RbdConfigurationEntry } from '~/app/shared/models/configuration'; export class RbdFormModel { name: string; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-list/rbd-list.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-list/rbd-list.component.spec.ts index 3bcb822b49c..899188a8b74 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-list/rbd-list.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-list/rbd-list.component.spec.ts @@ -11,15 +11,15 @@ import { configureTestBed, expectItemTasks, PermissionHelper -} from '../../../../testing/unit-test-helper'; -import { RbdService } from '../../../shared/api/rbd.service'; -import { TableStatusViewCache } from '../../../shared/classes/table-status-view-cache'; -import { TableActionsComponent } from '../../../shared/datatable/table-actions/table-actions.component'; -import { ViewCacheStatus } from '../../../shared/enum/view-cache-status.enum'; -import { ExecutingTask } from '../../../shared/models/executing-task'; -import { SummaryService } from '../../../shared/services/summary.service'; -import { TaskListService } from '../../../shared/services/task-list.service'; -import { SharedModule } from '../../../shared/shared.module'; +} from '~/testing/unit-test-helper'; +import { RbdService } from '~/app/shared/api/rbd.service'; +import { TableStatusViewCache } from '~/app/shared/classes/table-status-view-cache'; +import { TableActionsComponent } from '~/app/shared/datatable/table-actions/table-actions.component'; +import { ViewCacheStatus } from '~/app/shared/enum/view-cache-status.enum'; +import { ExecutingTask } from '~/app/shared/models/executing-task'; +import { SummaryService } from '~/app/shared/services/summary.service'; +import { TaskListService } from '~/app/shared/services/task-list.service'; +import { SharedModule } from '~/app/shared/shared.module'; import { RbdConfigurationListComponent } from '../rbd-configuration-list/rbd-configuration-list.component'; import { RbdDetailsComponent } from '../rbd-details/rbd-details.component'; import { RbdSnapshotListComponent } from '../rbd-snapshot-list/rbd-snapshot-list.component'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-list/rbd-list.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-list/rbd-list.component.ts index 70be703fdf4..049b417a6db 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-list/rbd-list.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-list/rbd-list.component.ts @@ -3,30 +3,30 @@ import { Component, OnInit, TemplateRef, ViewChild } from '@angular/core'; import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; import _ from 'lodash'; -import { RbdService } from '../../../shared/api/rbd.service'; -import { ListWithDetails } from '../../../shared/classes/list-with-details.class'; -import { TableStatusViewCache } from '../../../shared/classes/table-status-view-cache'; -import { ConfirmationModalComponent } from '../../../shared/components/confirmation-modal/confirmation-modal.component'; -import { CriticalConfirmationModalComponent } from '../../../shared/components/critical-confirmation-modal/critical-confirmation-modal.component'; -import { ActionLabelsI18n } from '../../../shared/constants/app.constants'; -import { TableComponent } from '../../../shared/datatable/table/table.component'; -import { CellTemplate } from '../../../shared/enum/cell-template.enum'; -import { Icons } from '../../../shared/enum/icons.enum'; -import { ViewCacheStatus } from '../../../shared/enum/view-cache-status.enum'; -import { CdTableAction } from '../../../shared/models/cd-table-action'; -import { CdTableColumn } from '../../../shared/models/cd-table-column'; -import { CdTableSelection } from '../../../shared/models/cd-table-selection'; -import { FinishedTask } from '../../../shared/models/finished-task'; -import { ImageSpec } from '../../../shared/models/image-spec'; -import { Permission } from '../../../shared/models/permissions'; -import { Task } from '../../../shared/models/task'; -import { DimlessBinaryPipe } from '../../../shared/pipes/dimless-binary.pipe'; -import { DimlessPipe } from '../../../shared/pipes/dimless.pipe'; -import { AuthStorageService } from '../../../shared/services/auth-storage.service'; -import { ModalService } from '../../../shared/services/modal.service'; -import { TaskListService } from '../../../shared/services/task-list.service'; -import { TaskWrapperService } from '../../../shared/services/task-wrapper.service'; -import { URLBuilderService } from '../../../shared/services/url-builder.service'; +import { RbdService } from '~/app/shared/api/rbd.service'; +import { ListWithDetails } from '~/app/shared/classes/list-with-details.class'; +import { TableStatusViewCache } from '~/app/shared/classes/table-status-view-cache'; +import { ConfirmationModalComponent } from '~/app/shared/components/confirmation-modal/confirmation-modal.component'; +import { CriticalConfirmationModalComponent } from '~/app/shared/components/critical-confirmation-modal/critical-confirmation-modal.component'; +import { ActionLabelsI18n } from '~/app/shared/constants/app.constants'; +import { TableComponent } from '~/app/shared/datatable/table/table.component'; +import { CellTemplate } from '~/app/shared/enum/cell-template.enum'; +import { Icons } from '~/app/shared/enum/icons.enum'; +import { ViewCacheStatus } from '~/app/shared/enum/view-cache-status.enum'; +import { CdTableAction } from '~/app/shared/models/cd-table-action'; +import { CdTableColumn } from '~/app/shared/models/cd-table-column'; +import { CdTableSelection } from '~/app/shared/models/cd-table-selection'; +import { FinishedTask } from '~/app/shared/models/finished-task'; +import { ImageSpec } from '~/app/shared/models/image-spec'; +import { Permission } from '~/app/shared/models/permissions'; +import { Task } from '~/app/shared/models/task'; +import { DimlessBinaryPipe } from '~/app/shared/pipes/dimless-binary.pipe'; +import { DimlessPipe } from '~/app/shared/pipes/dimless.pipe'; +import { AuthStorageService } from '~/app/shared/services/auth-storage.service'; +import { ModalService } from '~/app/shared/services/modal.service'; +import { TaskListService } from '~/app/shared/services/task-list.service'; +import { TaskWrapperService } from '~/app/shared/services/task-wrapper.service'; +import { URLBuilderService } from '~/app/shared/services/url-builder.service'; import { RbdParentModel } from '../rbd-form/rbd-parent.model'; import { RbdTrashMoveModalComponent } from '../rbd-trash-move-modal/rbd-trash-move-modal.component'; import { RBDImageFormat, RbdModel } from './rbd-model'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-namespace-form/rbd-namespace-form-modal.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-namespace-form/rbd-namespace-form-modal.component.spec.ts index 6ef29adc4b2..a6a21571141 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-namespace-form/rbd-namespace-form-modal.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-namespace-form/rbd-namespace-form-modal.component.spec.ts @@ -6,9 +6,9 @@ import { RouterTestingModule } from '@angular/router/testing'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { ToastrModule } from 'ngx-toastr'; -import { configureTestBed } from '../../../../testing/unit-test-helper'; -import { ComponentsModule } from '../../../shared/components/components.module'; -import { AuthStorageService } from '../../../shared/services/auth-storage.service'; +import { configureTestBed } from '~/testing/unit-test-helper'; +import { ComponentsModule } from '~/app/shared/components/components.module'; +import { AuthStorageService } from '~/app/shared/services/auth-storage.service'; import { RbdNamespaceFormModalComponent } from './rbd-namespace-form-modal.component'; describe('RbdNamespaceFormModalComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-namespace-form/rbd-namespace-form-modal.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-namespace-form/rbd-namespace-form-modal.component.ts index 99c73300b6a..701bbd4532e 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-namespace-form/rbd-namespace-form-modal.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-namespace-form/rbd-namespace-form-modal.component.ts @@ -10,15 +10,15 @@ import { import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { Subject } from 'rxjs'; -import { PoolService } from '../../../shared/api/pool.service'; -import { RbdService } from '../../../shared/api/rbd.service'; -import { NotificationType } from '../../../shared/enum/notification-type.enum'; -import { CdFormGroup } from '../../../shared/forms/cd-form-group'; -import { FinishedTask } from '../../../shared/models/finished-task'; -import { Permission } from '../../../shared/models/permissions'; -import { AuthStorageService } from '../../../shared/services/auth-storage.service'; -import { NotificationService } from '../../../shared/services/notification.service'; -import { Pool } from '../../pool/pool'; +import { PoolService } from '~/app/shared/api/pool.service'; +import { RbdService } from '~/app/shared/api/rbd.service'; +import { NotificationType } from '~/app/shared/enum/notification-type.enum'; +import { CdFormGroup } from '~/app/shared/forms/cd-form-group'; +import { FinishedTask } from '~/app/shared/models/finished-task'; +import { Permission } from '~/app/shared/models/permissions'; +import { AuthStorageService } from '~/app/shared/services/auth-storage.service'; +import { NotificationService } from '~/app/shared/services/notification.service'; +import { Pool } from '~/app/ceph/pool/pool'; @Component({ selector: 'cd-rbd-namespace-form-modal', diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-namespace-list/rbd-namespace-list.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-namespace-list/rbd-namespace-list.component.spec.ts index eed9c6c532a..6801ecfe175 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-namespace-list/rbd-namespace-list.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-namespace-list/rbd-namespace-list.component.spec.ts @@ -6,9 +6,9 @@ import { RouterTestingModule } from '@angular/router/testing'; import { NgbNavModule } from '@ng-bootstrap/ng-bootstrap'; import { ToastrModule } from 'ngx-toastr'; -import { configureTestBed } from '../../../../testing/unit-test-helper'; -import { TaskListService } from '../../../shared/services/task-list.service'; -import { SharedModule } from '../../../shared/shared.module'; +import { configureTestBed } from '~/testing/unit-test-helper'; +import { TaskListService } from '~/app/shared/services/task-list.service'; +import { SharedModule } from '~/app/shared/shared.module'; import { RbdTabsComponent } from '../rbd-tabs/rbd-tabs.component'; import { RbdNamespaceListComponent } from './rbd-namespace-list.component'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-namespace-list/rbd-namespace-list.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-namespace-list/rbd-namespace-list.component.ts index 706a91be580..4617e13e424 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-namespace-list/rbd-namespace-list.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-namespace-list/rbd-namespace-list.component.ts @@ -3,20 +3,20 @@ import { Component, OnInit } from '@angular/core'; import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; import { forkJoin, Observable } from 'rxjs'; -import { PoolService } from '../../../shared/api/pool.service'; -import { RbdService } from '../../../shared/api/rbd.service'; -import { CriticalConfirmationModalComponent } from '../../../shared/components/critical-confirmation-modal/critical-confirmation-modal.component'; -import { ActionLabelsI18n } from '../../../shared/constants/app.constants'; -import { Icons } from '../../../shared/enum/icons.enum'; -import { NotificationType } from '../../../shared/enum/notification-type.enum'; -import { CdTableAction } from '../../../shared/models/cd-table-action'; -import { CdTableColumn } from '../../../shared/models/cd-table-column'; -import { CdTableSelection } from '../../../shared/models/cd-table-selection'; -import { Permission } from '../../../shared/models/permissions'; -import { AuthStorageService } from '../../../shared/services/auth-storage.service'; -import { ModalService } from '../../../shared/services/modal.service'; -import { NotificationService } from '../../../shared/services/notification.service'; -import { TaskListService } from '../../../shared/services/task-list.service'; +import { PoolService } from '~/app/shared/api/pool.service'; +import { RbdService } from '~/app/shared/api/rbd.service'; +import { CriticalConfirmationModalComponent } from '~/app/shared/components/critical-confirmation-modal/critical-confirmation-modal.component'; +import { ActionLabelsI18n } from '~/app/shared/constants/app.constants'; +import { Icons } from '~/app/shared/enum/icons.enum'; +import { NotificationType } from '~/app/shared/enum/notification-type.enum'; +import { CdTableAction } from '~/app/shared/models/cd-table-action'; +import { CdTableColumn } from '~/app/shared/models/cd-table-column'; +import { CdTableSelection } from '~/app/shared/models/cd-table-selection'; +import { Permission } from '~/app/shared/models/permissions'; +import { AuthStorageService } from '~/app/shared/services/auth-storage.service'; +import { ModalService } from '~/app/shared/services/modal.service'; +import { NotificationService } from '~/app/shared/services/notification.service'; +import { TaskListService } from '~/app/shared/services/task-list.service'; import { RbdNamespaceFormModalComponent } from '../rbd-namespace-form/rbd-namespace-form-modal.component'; @Component({ diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-performance/rbd-performance.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-performance/rbd-performance.component.spec.ts index 9db62c9bada..835fcbf60d6 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-performance/rbd-performance.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-performance/rbd-performance.component.spec.ts @@ -4,8 +4,8 @@ import { RouterTestingModule } from '@angular/router/testing'; import { NgbNavModule } from '@ng-bootstrap/ng-bootstrap'; -import { configureTestBed } from '../../../../testing/unit-test-helper'; -import { SharedModule } from '../../../shared/shared.module'; +import { configureTestBed } from '~/testing/unit-test-helper'; +import { SharedModule } from '~/app/shared/shared.module'; import { RbdTabsComponent } from '../rbd-tabs/rbd-tabs.component'; import { RbdPerformanceComponent } from './rbd-performance.component'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-snapshot-form/rbd-snapshot-form-modal.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-snapshot-form/rbd-snapshot-form-modal.component.spec.ts index 15ca77f21c2..5fae807782e 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-snapshot-form/rbd-snapshot-form-modal.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-snapshot-form/rbd-snapshot-form-modal.component.spec.ts @@ -6,10 +6,10 @@ import { RouterTestingModule } from '@angular/router/testing'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { ToastrModule } from 'ngx-toastr'; -import { configureTestBed } from '../../../../testing/unit-test-helper'; -import { ComponentsModule } from '../../../shared/components/components.module'; -import { PipesModule } from '../../../shared/pipes/pipes.module'; -import { AuthStorageService } from '../../../shared/services/auth-storage.service'; +import { configureTestBed } from '~/testing/unit-test-helper'; +import { ComponentsModule } from '~/app/shared/components/components.module'; +import { PipesModule } from '~/app/shared/pipes/pipes.module'; +import { AuthStorageService } from '~/app/shared/services/auth-storage.service'; import { RbdSnapshotFormModalComponent } from './rbd-snapshot-form-modal.component'; describe('RbdSnapshotFormModalComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-snapshot-form/rbd-snapshot-form-modal.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-snapshot-form/rbd-snapshot-form-modal.component.ts index cb744d6056f..83296866c1a 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-snapshot-form/rbd-snapshot-form-modal.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-snapshot-form/rbd-snapshot-form-modal.component.ts @@ -4,13 +4,13 @@ import { FormControl, Validators } from '@angular/forms'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { Subject } from 'rxjs'; -import { RbdService } from '../../../shared/api/rbd.service'; -import { ActionLabelsI18n } from '../../../shared/constants/app.constants'; -import { CdFormGroup } from '../../../shared/forms/cd-form-group'; -import { FinishedTask } from '../../../shared/models/finished-task'; -import { ImageSpec } from '../../../shared/models/image-spec'; -import { NotificationService } from '../../../shared/services/notification.service'; -import { TaskManagerService } from '../../../shared/services/task-manager.service'; +import { RbdService } from '~/app/shared/api/rbd.service'; +import { ActionLabelsI18n } from '~/app/shared/constants/app.constants'; +import { CdFormGroup } from '~/app/shared/forms/cd-form-group'; +import { FinishedTask } from '~/app/shared/models/finished-task'; +import { ImageSpec } from '~/app/shared/models/image-spec'; +import { NotificationService } from '~/app/shared/services/notification.service'; +import { TaskManagerService } from '~/app/shared/services/task-manager.service'; @Component({ selector: 'cd-rbd-snapshot-form-modal', diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-snapshot-list/rbd-snapshot-actions.model.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-snapshot-list/rbd-snapshot-actions.model.ts index 0bf61061e40..66eba2231e7 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-snapshot-list/rbd-snapshot-actions.model.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-snapshot-list/rbd-snapshot-actions.model.ts @@ -1,9 +1,9 @@ -import { RbdService } from 'app/shared/api/rbd.service'; +import { RbdService } from '~/app/shared/api/rbd.service'; -import { ActionLabelsI18n } from '../../../shared/constants/app.constants'; -import { Icons } from '../../../shared/enum/icons.enum'; -import { CdTableAction } from '../../../shared/models/cd-table-action'; -import { CdTableSelection } from '../../../shared/models/cd-table-selection'; +import { ActionLabelsI18n } from '~/app/shared/constants/app.constants'; +import { Icons } from '~/app/shared/enum/icons.enum'; +import { CdTableAction } from '~/app/shared/models/cd-table-action'; +import { CdTableSelection } from '~/app/shared/models/cd-table-selection'; export class RbdSnapshotActionsModel { create: CdTableAction; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-snapshot-list/rbd-snapshot-list.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-snapshot-list/rbd-snapshot-list.component.spec.ts index fec0995ca1f..e3ba3c6b05c 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-snapshot-list/rbd-snapshot-list.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-snapshot-list/rbd-snapshot-list.component.spec.ts @@ -12,22 +12,22 @@ import { configureTestBed, expectItemTasks, PermissionHelper -} from '../../../../testing/unit-test-helper'; -import { RbdService } from '../../../shared/api/rbd.service'; -import { ComponentsModule } from '../../../shared/components/components.module'; -import { CriticalConfirmationModalComponent } from '../../../shared/components/critical-confirmation-modal/critical-confirmation-modal.component'; -import { ActionLabelsI18n } from '../../../shared/constants/app.constants'; -import { DataTableModule } from '../../../shared/datatable/datatable.module'; -import { TableActionsComponent } from '../../../shared/datatable/table-actions/table-actions.component'; -import { CdTableSelection } from '../../../shared/models/cd-table-selection'; -import { ExecutingTask } from '../../../shared/models/executing-task'; -import { Permissions } from '../../../shared/models/permissions'; -import { PipesModule } from '../../../shared/pipes/pipes.module'; -import { AuthStorageService } from '../../../shared/services/auth-storage.service'; -import { ModalService } from '../../../shared/services/modal.service'; -import { NotificationService } from '../../../shared/services/notification.service'; -import { SummaryService } from '../../../shared/services/summary.service'; -import { TaskListService } from '../../../shared/services/task-list.service'; +} from '~/testing/unit-test-helper'; +import { RbdService } from '~/app/shared/api/rbd.service'; +import { ComponentsModule } from '~/app/shared/components/components.module'; +import { CriticalConfirmationModalComponent } from '~/app/shared/components/critical-confirmation-modal/critical-confirmation-modal.component'; +import { ActionLabelsI18n } from '~/app/shared/constants/app.constants'; +import { DataTableModule } from '~/app/shared/datatable/datatable.module'; +import { TableActionsComponent } from '~/app/shared/datatable/table-actions/table-actions.component'; +import { CdTableSelection } from '~/app/shared/models/cd-table-selection'; +import { ExecutingTask } from '~/app/shared/models/executing-task'; +import { Permissions } from '~/app/shared/models/permissions'; +import { PipesModule } from '~/app/shared/pipes/pipes.module'; +import { AuthStorageService } from '~/app/shared/services/auth-storage.service'; +import { ModalService } from '~/app/shared/services/modal.service'; +import { NotificationService } from '~/app/shared/services/notification.service'; +import { SummaryService } from '~/app/shared/services/summary.service'; +import { TaskListService } from '~/app/shared/services/task-list.service'; import { RbdSnapshotFormModalComponent } from '../rbd-snapshot-form/rbd-snapshot-form-modal.component'; import { RbdTabsComponent } from '../rbd-tabs/rbd-tabs.component'; import { RbdSnapshotActionsModel } from './rbd-snapshot-actions.model'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-snapshot-list/rbd-snapshot-list.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-snapshot-list/rbd-snapshot-list.component.ts index 26542b55321..6a8be5b134a 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-snapshot-list/rbd-snapshot-list.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-snapshot-list/rbd-snapshot-list.component.ts @@ -13,28 +13,28 @@ import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; import moment from 'moment'; import { of } from 'rxjs'; -import { RbdService } from '../../../shared/api/rbd.service'; -import { CdHelperClass } from '../../../shared/classes/cd-helper.class'; -import { ConfirmationModalComponent } from '../../../shared/components/confirmation-modal/confirmation-modal.component'; -import { CriticalConfirmationModalComponent } from '../../../shared/components/critical-confirmation-modal/critical-confirmation-modal.component'; -import { ActionLabelsI18n } from '../../../shared/constants/app.constants'; -import { CellTemplate } from '../../../shared/enum/cell-template.enum'; -import { CdTableAction } from '../../../shared/models/cd-table-action'; -import { CdTableColumn } from '../../../shared/models/cd-table-column'; -import { CdTableSelection } from '../../../shared/models/cd-table-selection'; -import { ExecutingTask } from '../../../shared/models/executing-task'; -import { FinishedTask } from '../../../shared/models/finished-task'; -import { ImageSpec } from '../../../shared/models/image-spec'; -import { Permission } from '../../../shared/models/permissions'; -import { Task } from '../../../shared/models/task'; -import { CdDatePipe } from '../../../shared/pipes/cd-date.pipe'; -import { DimlessBinaryPipe } from '../../../shared/pipes/dimless-binary.pipe'; -import { AuthStorageService } from '../../../shared/services/auth-storage.service'; -import { ModalService } from '../../../shared/services/modal.service'; -import { NotificationService } from '../../../shared/services/notification.service'; -import { SummaryService } from '../../../shared/services/summary.service'; -import { TaskListService } from '../../../shared/services/task-list.service'; -import { TaskManagerService } from '../../../shared/services/task-manager.service'; +import { RbdService } from '~/app/shared/api/rbd.service'; +import { CdHelperClass } from '~/app/shared/classes/cd-helper.class'; +import { ConfirmationModalComponent } from '~/app/shared/components/confirmation-modal/confirmation-modal.component'; +import { CriticalConfirmationModalComponent } from '~/app/shared/components/critical-confirmation-modal/critical-confirmation-modal.component'; +import { ActionLabelsI18n } from '~/app/shared/constants/app.constants'; +import { CellTemplate } from '~/app/shared/enum/cell-template.enum'; +import { CdTableAction } from '~/app/shared/models/cd-table-action'; +import { CdTableColumn } from '~/app/shared/models/cd-table-column'; +import { CdTableSelection } from '~/app/shared/models/cd-table-selection'; +import { ExecutingTask } from '~/app/shared/models/executing-task'; +import { FinishedTask } from '~/app/shared/models/finished-task'; +import { ImageSpec } from '~/app/shared/models/image-spec'; +import { Permission } from '~/app/shared/models/permissions'; +import { Task } from '~/app/shared/models/task'; +import { CdDatePipe } from '~/app/shared/pipes/cd-date.pipe'; +import { DimlessBinaryPipe } from '~/app/shared/pipes/dimless-binary.pipe'; +import { AuthStorageService } from '~/app/shared/services/auth-storage.service'; +import { ModalService } from '~/app/shared/services/modal.service'; +import { NotificationService } from '~/app/shared/services/notification.service'; +import { SummaryService } from '~/app/shared/services/summary.service'; +import { TaskListService } from '~/app/shared/services/task-list.service'; +import { TaskManagerService } from '~/app/shared/services/task-manager.service'; import { RbdSnapshotFormModalComponent } from '../rbd-snapshot-form/rbd-snapshot-form-modal.component'; import { RbdSnapshotActionsModel } from './rbd-snapshot-actions.model'; import { RbdSnapshotModel } from './rbd-snapshot.model'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-tabs/rbd-tabs.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-tabs/rbd-tabs.component.spec.ts index 52065ff5f09..73a9490d7cf 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-tabs/rbd-tabs.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-tabs/rbd-tabs.component.spec.ts @@ -3,7 +3,7 @@ import { RouterTestingModule } from '@angular/router/testing'; import { NgbNavModule } from '@ng-bootstrap/ng-bootstrap'; -import { configureTestBed } from '../../../../testing/unit-test-helper'; +import { configureTestBed } from '~/testing/unit-test-helper'; import { RbdTabsComponent } from './rbd-tabs.component'; describe('RbdTabsComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-tabs/rbd-tabs.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-tabs/rbd-tabs.component.ts index 0f77d14731d..056cb176458 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-tabs/rbd-tabs.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-tabs/rbd-tabs.component.ts @@ -1,8 +1,8 @@ import { Component } from '@angular/core'; import { Router } from '@angular/router'; -import { Permission } from '../../../shared/models/permissions'; -import { AuthStorageService } from '../../../shared/services/auth-storage.service'; +import { Permission } from '~/app/shared/models/permissions'; +import { AuthStorageService } from '~/app/shared/services/auth-storage.service'; @Component({ selector: 'cd-rbd-tabs', diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-trash-list/rbd-trash-list.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-trash-list/rbd-trash-list.component.spec.ts index 52192d79f51..af08983d909 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-trash-list/rbd-trash-list.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-trash-list/rbd-trash-list.component.spec.ts @@ -9,14 +9,14 @@ import moment from 'moment'; import { ToastrModule } from 'ngx-toastr'; import { of } from 'rxjs'; -import { configureTestBed, expectItemTasks } from '../../../../testing/unit-test-helper'; -import { RbdService } from '../../../shared/api/rbd.service'; -import { CdTableSelection } from '../../../shared/models/cd-table-selection'; -import { ExecutingTask } from '../../../shared/models/executing-task'; -import { Summary } from '../../../shared/models/summary.model'; -import { SummaryService } from '../../../shared/services/summary.service'; -import { TaskListService } from '../../../shared/services/task-list.service'; -import { SharedModule } from '../../../shared/shared.module'; +import { configureTestBed, expectItemTasks } from '~/testing/unit-test-helper'; +import { RbdService } from '~/app/shared/api/rbd.service'; +import { CdTableSelection } from '~/app/shared/models/cd-table-selection'; +import { ExecutingTask } from '~/app/shared/models/executing-task'; +import { Summary } from '~/app/shared/models/summary.model'; +import { SummaryService } from '~/app/shared/services/summary.service'; +import { TaskListService } from '~/app/shared/services/task-list.service'; +import { SharedModule } from '~/app/shared/shared.module'; import { RbdTabsComponent } from '../rbd-tabs/rbd-tabs.component'; import { RbdTrashListComponent } from './rbd-trash-list.component'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-trash-list/rbd-trash-list.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-trash-list/rbd-trash-list.component.ts index cdd39f37845..a0fafc19238 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-trash-list/rbd-trash-list.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-trash-list/rbd-trash-list.component.ts @@ -4,27 +4,27 @@ import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; import _ from 'lodash'; import moment from 'moment'; -import { RbdService } from '../../../shared/api/rbd.service'; -import { TableStatusViewCache } from '../../../shared/classes/table-status-view-cache'; -import { CriticalConfirmationModalComponent } from '../../../shared/components/critical-confirmation-modal/critical-confirmation-modal.component'; -import { ActionLabelsI18n } from '../../../shared/constants/app.constants'; -import { TableComponent } from '../../../shared/datatable/table/table.component'; -import { CellTemplate } from '../../../shared/enum/cell-template.enum'; -import { Icons } from '../../../shared/enum/icons.enum'; -import { ViewCacheStatus } from '../../../shared/enum/view-cache-status.enum'; -import { CdTableAction } from '../../../shared/models/cd-table-action'; -import { CdTableColumn } from '../../../shared/models/cd-table-column'; -import { CdTableSelection } from '../../../shared/models/cd-table-selection'; -import { ExecutingTask } from '../../../shared/models/executing-task'; -import { FinishedTask } from '../../../shared/models/finished-task'; -import { ImageSpec } from '../../../shared/models/image-spec'; -import { Permission } from '../../../shared/models/permissions'; -import { Task } from '../../../shared/models/task'; -import { CdDatePipe } from '../../../shared/pipes/cd-date.pipe'; -import { AuthStorageService } from '../../../shared/services/auth-storage.service'; -import { ModalService } from '../../../shared/services/modal.service'; -import { TaskListService } from '../../../shared/services/task-list.service'; -import { TaskWrapperService } from '../../../shared/services/task-wrapper.service'; +import { RbdService } from '~/app/shared/api/rbd.service'; +import { TableStatusViewCache } from '~/app/shared/classes/table-status-view-cache'; +import { CriticalConfirmationModalComponent } from '~/app/shared/components/critical-confirmation-modal/critical-confirmation-modal.component'; +import { ActionLabelsI18n } from '~/app/shared/constants/app.constants'; +import { TableComponent } from '~/app/shared/datatable/table/table.component'; +import { CellTemplate } from '~/app/shared/enum/cell-template.enum'; +import { Icons } from '~/app/shared/enum/icons.enum'; +import { ViewCacheStatus } from '~/app/shared/enum/view-cache-status.enum'; +import { CdTableAction } from '~/app/shared/models/cd-table-action'; +import { CdTableColumn } from '~/app/shared/models/cd-table-column'; +import { CdTableSelection } from '~/app/shared/models/cd-table-selection'; +import { ExecutingTask } from '~/app/shared/models/executing-task'; +import { FinishedTask } from '~/app/shared/models/finished-task'; +import { ImageSpec } from '~/app/shared/models/image-spec'; +import { Permission } from '~/app/shared/models/permissions'; +import { Task } from '~/app/shared/models/task'; +import { CdDatePipe } from '~/app/shared/pipes/cd-date.pipe'; +import { AuthStorageService } from '~/app/shared/services/auth-storage.service'; +import { ModalService } from '~/app/shared/services/modal.service'; +import { TaskListService } from '~/app/shared/services/task-list.service'; +import { TaskWrapperService } from '~/app/shared/services/task-wrapper.service'; import { RbdTrashPurgeModalComponent } from '../rbd-trash-purge-modal/rbd-trash-purge-modal.component'; import { RbdTrashRestoreModalComponent } from '../rbd-trash-restore-modal/rbd-trash-restore-modal.component'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-trash-move-modal/rbd-trash-move-modal.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-trash-move-modal/rbd-trash-move-modal.component.spec.ts index 0bc280f7428..cb75cc6e9a4 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-trash-move-modal/rbd-trash-move-modal.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-trash-move-modal/rbd-trash-move-modal.component.spec.ts @@ -7,9 +7,9 @@ import { NgbActiveModal, NgbPopoverModule } from '@ng-bootstrap/ng-bootstrap'; import moment from 'moment'; import { ToastrModule } from 'ngx-toastr'; -import { configureTestBed } from '../../../../testing/unit-test-helper'; -import { NotificationService } from '../../../shared/services/notification.service'; -import { SharedModule } from '../../../shared/shared.module'; +import { configureTestBed } from '~/testing/unit-test-helper'; +import { NotificationService } from '~/app/shared/services/notification.service'; +import { SharedModule } from '~/app/shared/shared.module'; import { RbdTrashMoveModalComponent } from './rbd-trash-move-modal.component'; describe('RbdTrashMoveModalComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-trash-move-modal/rbd-trash-move-modal.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-trash-move-modal/rbd-trash-move-modal.component.ts index f7c49123868..28b82658162 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-trash-move-modal/rbd-trash-move-modal.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-trash-move-modal/rbd-trash-move-modal.component.ts @@ -3,14 +3,14 @@ import { Component, OnInit } from '@angular/core'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import moment from 'moment'; -import { RbdService } from '../../../shared/api/rbd.service'; -import { CdFormBuilder } from '../../../shared/forms/cd-form-builder'; -import { CdFormGroup } from '../../../shared/forms/cd-form-group'; -import { CdValidators } from '../../../shared/forms/cd-validators'; -import { ExecutingTask } from '../../../shared/models/executing-task'; -import { FinishedTask } from '../../../shared/models/finished-task'; -import { ImageSpec } from '../../../shared/models/image-spec'; -import { TaskWrapperService } from '../../../shared/services/task-wrapper.service'; +import { RbdService } from '~/app/shared/api/rbd.service'; +import { CdFormBuilder } from '~/app/shared/forms/cd-form-builder'; +import { CdFormGroup } from '~/app/shared/forms/cd-form-group'; +import { CdValidators } from '~/app/shared/forms/cd-validators'; +import { ExecutingTask } from '~/app/shared/models/executing-task'; +import { FinishedTask } from '~/app/shared/models/finished-task'; +import { ImageSpec } from '~/app/shared/models/image-spec'; +import { TaskWrapperService } from '~/app/shared/services/task-wrapper.service'; @Component({ selector: 'cd-rbd-trash-move-modal', diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-trash-purge-modal/rbd-trash-purge-modal.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-trash-purge-modal/rbd-trash-purge-modal.component.spec.ts index 852c785edae..c8d315a0048 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-trash-purge-modal/rbd-trash-purge-modal.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-trash-purge-modal/rbd-trash-purge-modal.component.spec.ts @@ -10,10 +10,10 @@ import { RouterTestingModule } from '@angular/router/testing'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { ToastrModule } from 'ngx-toastr'; -import { configureTestBed } from '../../../../testing/unit-test-helper'; -import { Permission } from '../../../shared/models/permissions'; -import { NotificationService } from '../../../shared/services/notification.service'; -import { SharedModule } from '../../../shared/shared.module'; +import { configureTestBed } from '~/testing/unit-test-helper'; +import { Permission } from '~/app/shared/models/permissions'; +import { NotificationService } from '~/app/shared/services/notification.service'; +import { SharedModule } from '~/app/shared/shared.module'; import { RbdTrashPurgeModalComponent } from './rbd-trash-purge-modal.component'; describe('RbdTrashPurgeModalComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-trash-purge-modal/rbd-trash-purge-modal.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-trash-purge-modal/rbd-trash-purge-modal.component.ts index 0da8685cf1c..eeb53cbbda0 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-trash-purge-modal/rbd-trash-purge-modal.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-trash-purge-modal/rbd-trash-purge-modal.component.ts @@ -2,15 +2,15 @@ import { Component, OnInit } from '@angular/core'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; -import { PoolService } from '../../../shared/api/pool.service'; -import { RbdService } from '../../../shared/api/rbd.service'; -import { CdFormBuilder } from '../../../shared/forms/cd-form-builder'; -import { CdFormGroup } from '../../../shared/forms/cd-form-group'; -import { FinishedTask } from '../../../shared/models/finished-task'; -import { Permission } from '../../../shared/models/permissions'; -import { AuthStorageService } from '../../../shared/services/auth-storage.service'; -import { TaskWrapperService } from '../../../shared/services/task-wrapper.service'; -import { Pool } from '../../pool/pool'; +import { PoolService } from '~/app/shared/api/pool.service'; +import { RbdService } from '~/app/shared/api/rbd.service'; +import { CdFormBuilder } from '~/app/shared/forms/cd-form-builder'; +import { CdFormGroup } from '~/app/shared/forms/cd-form-group'; +import { FinishedTask } from '~/app/shared/models/finished-task'; +import { Permission } from '~/app/shared/models/permissions'; +import { AuthStorageService } from '~/app/shared/services/auth-storage.service'; +import { TaskWrapperService } from '~/app/shared/services/task-wrapper.service'; +import { Pool } from '~/app/ceph/pool/pool'; @Component({ selector: 'cd-rbd-trash-purge-modal', diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-trash-restore-modal/rbd-trash-restore-modal.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-trash-restore-modal/rbd-trash-restore-modal.component.spec.ts index 1577afbb996..065716a46d8 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-trash-restore-modal/rbd-trash-restore-modal.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-trash-restore-modal/rbd-trash-restore-modal.component.spec.ts @@ -10,9 +10,9 @@ import { RouterTestingModule } from '@angular/router/testing'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { ToastrModule } from 'ngx-toastr'; -import { configureTestBed } from '../../../../testing/unit-test-helper'; -import { NotificationService } from '../../../shared/services/notification.service'; -import { SharedModule } from '../../../shared/shared.module'; +import { configureTestBed } from '~/testing/unit-test-helper'; +import { NotificationService } from '~/app/shared/services/notification.service'; +import { SharedModule } from '~/app/shared/shared.module'; import { RbdTrashRestoreModalComponent } from './rbd-trash-restore-modal.component'; describe('RbdTrashRestoreModalComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-trash-restore-modal/rbd-trash-restore-modal.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-trash-restore-modal/rbd-trash-restore-modal.component.ts index 869740ae542..a2eae8c1b28 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-trash-restore-modal/rbd-trash-restore-modal.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-trash-restore-modal/rbd-trash-restore-modal.component.ts @@ -2,13 +2,13 @@ import { Component, OnInit } from '@angular/core'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; -import { RbdService } from '../../../shared/api/rbd.service'; -import { CdFormBuilder } from '../../../shared/forms/cd-form-builder'; -import { CdFormGroup } from '../../../shared/forms/cd-form-group'; -import { ExecutingTask } from '../../../shared/models/executing-task'; -import { FinishedTask } from '../../../shared/models/finished-task'; -import { ImageSpec } from '../../../shared/models/image-spec'; -import { TaskWrapperService } from '../../../shared/services/task-wrapper.service'; +import { RbdService } from '~/app/shared/api/rbd.service'; +import { CdFormBuilder } from '~/app/shared/forms/cd-form-builder'; +import { CdFormGroup } from '~/app/shared/forms/cd-form-group'; +import { ExecutingTask } from '~/app/shared/models/executing-task'; +import { FinishedTask } from '~/app/shared/models/finished-task'; +import { ImageSpec } from '~/app/shared/models/image-spec'; +import { TaskWrapperService } from '~/app/shared/services/task-wrapper.service'; @Component({ selector: 'cd-rbd-trash-restore-modal', diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-chart/cephfs-chart.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-chart/cephfs-chart.component.spec.ts index 9c8e4f95b65..4ba20fa8966 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-chart/cephfs-chart.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-chart/cephfs-chart.component.spec.ts @@ -2,7 +2,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ChartsModule } from 'ng2-charts'; -import { configureTestBed } from '../../../../testing/unit-test-helper'; +import { configureTestBed } from '~/testing/unit-test-helper'; import { CephfsChartComponent } from './cephfs-chart.component'; describe('CephfsChartComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-chart/cephfs-chart.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-chart/cephfs-chart.component.ts index 286982f8f2e..7f3c9437d47 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-chart/cephfs-chart.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-chart/cephfs-chart.component.ts @@ -4,7 +4,7 @@ import { ChartDataSets, ChartOptions, ChartPoint, ChartType } from 'chart.js'; import _ from 'lodash'; import moment from 'moment'; -import { ChartTooltip } from '../../../shared/models/chart-tooltip'; +import { ChartTooltip } from '~/app/shared/models/chart-tooltip'; @Component({ selector: 'cd-cephfs-chart', diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-clients/cephfs-clients.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-clients/cephfs-clients.component.spec.ts index c3982a9cc1e..af8a1a9b64c 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-clients/cephfs-clients.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-clients/cephfs-clients.component.spec.ts @@ -4,11 +4,11 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { ToastrModule } from 'ngx-toastr'; -import { configureTestBed, PermissionHelper } from '../../../../testing/unit-test-helper'; -import { TableStatusViewCache } from '../../../shared/classes/table-status-view-cache'; -import { TableActionsComponent } from '../../../shared/datatable/table-actions/table-actions.component'; -import { ViewCacheStatus } from '../../../shared/enum/view-cache-status.enum'; -import { SharedModule } from '../../../shared/shared.module'; +import { configureTestBed, PermissionHelper } from '~/testing/unit-test-helper'; +import { TableStatusViewCache } from '~/app/shared/classes/table-status-view-cache'; +import { TableActionsComponent } from '~/app/shared/datatable/table-actions/table-actions.component'; +import { ViewCacheStatus } from '~/app/shared/enum/view-cache-status.enum'; +import { SharedModule } from '~/app/shared/shared.module'; import { CephfsClientsComponent } from './cephfs-clients.component'; describe('CephfsClientsComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-clients/cephfs-clients.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-clients/cephfs-clients.component.ts index f88714d6fd1..fb43cca4b20 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-clients/cephfs-clients.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-clients/cephfs-clients.component.ts @@ -2,19 +2,19 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; -import { CephfsService } from '../../../shared/api/cephfs.service'; -import { TableStatusViewCache } from '../../../shared/classes/table-status-view-cache'; -import { CriticalConfirmationModalComponent } from '../../../shared/components/critical-confirmation-modal/critical-confirmation-modal.component'; -import { ActionLabelsI18n } from '../../../shared/constants/app.constants'; -import { Icons } from '../../../shared/enum/icons.enum'; -import { NotificationType } from '../../../shared/enum/notification-type.enum'; -import { CdTableAction } from '../../../shared/models/cd-table-action'; -import { CdTableColumn } from '../../../shared/models/cd-table-column'; -import { CdTableSelection } from '../../../shared/models/cd-table-selection'; -import { Permission } from '../../../shared/models/permissions'; -import { AuthStorageService } from '../../../shared/services/auth-storage.service'; -import { ModalService } from '../../../shared/services/modal.service'; -import { NotificationService } from '../../../shared/services/notification.service'; +import { CephfsService } from '~/app/shared/api/cephfs.service'; +import { TableStatusViewCache } from '~/app/shared/classes/table-status-view-cache'; +import { CriticalConfirmationModalComponent } from '~/app/shared/components/critical-confirmation-modal/critical-confirmation-modal.component'; +import { ActionLabelsI18n } from '~/app/shared/constants/app.constants'; +import { Icons } from '~/app/shared/enum/icons.enum'; +import { NotificationType } from '~/app/shared/enum/notification-type.enum'; +import { CdTableAction } from '~/app/shared/models/cd-table-action'; +import { CdTableColumn } from '~/app/shared/models/cd-table-column'; +import { CdTableSelection } from '~/app/shared/models/cd-table-selection'; +import { Permission } from '~/app/shared/models/permissions'; +import { AuthStorageService } from '~/app/shared/services/auth-storage.service'; +import { ModalService } from '~/app/shared/services/modal.service'; +import { NotificationService } from '~/app/shared/services/notification.service'; @Component({ selector: 'cd-cephfs-clients', diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-detail/cephfs-detail.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-detail/cephfs-detail.component.spec.ts index 130439e52a2..67d5bb1e87c 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-detail/cephfs-detail.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-detail/cephfs-detail.component.spec.ts @@ -1,8 +1,8 @@ import { Component, Input } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { configureTestBed } from '../../../../testing/unit-test-helper'; -import { SharedModule } from '../../../shared/shared.module'; +import { configureTestBed } from '~/testing/unit-test-helper'; +import { SharedModule } from '~/app/shared/shared.module'; import { CephfsDetailComponent } from './cephfs-detail.component'; @Component({ selector: 'cd-cephfs-chart', template: '' }) diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-detail/cephfs-detail.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-detail/cephfs-detail.component.ts index bbf63f4107c..b935714971d 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-detail/cephfs-detail.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-detail/cephfs-detail.component.ts @@ -1,8 +1,8 @@ import { Component, Input, OnChanges, OnInit, TemplateRef, ViewChild } from '@angular/core'; -import { CdTableColumn } from '../../../shared/models/cd-table-column'; -import { DimlessBinaryPipe } from '../../../shared/pipes/dimless-binary.pipe'; -import { DimlessPipe } from '../../../shared/pipes/dimless.pipe'; +import { CdTableColumn } from '~/app/shared/models/cd-table-column'; +import { DimlessBinaryPipe } from '~/app/shared/pipes/dimless-binary.pipe'; +import { DimlessPipe } from '~/app/shared/pipes/dimless.pipe'; @Component({ selector: 'cd-cephfs-detail', diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-directories/cephfs-directories.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-directories/cephfs-directories.component.spec.ts index 97839b3cda6..f9634407454 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-directories/cephfs-directories.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-directories/cephfs-directories.component.spec.ts @@ -13,23 +13,23 @@ import { configureTestBed, modalServiceShow, PermissionHelper -} from '../../../../testing/unit-test-helper'; -import { CephfsService } from '../../../shared/api/cephfs.service'; -import { ConfirmationModalComponent } from '../../../shared/components/confirmation-modal/confirmation-modal.component'; -import { CriticalConfirmationModalComponent } from '../../../shared/components/critical-confirmation-modal/critical-confirmation-modal.component'; -import { FormModalComponent } from '../../../shared/components/form-modal/form-modal.component'; -import { NotificationType } from '../../../shared/enum/notification-type.enum'; -import { CdValidators } from '../../../shared/forms/cd-validators'; -import { CdTableAction } from '../../../shared/models/cd-table-action'; -import { CdTableSelection } from '../../../shared/models/cd-table-selection'; +} from '~/testing/unit-test-helper'; +import { CephfsService } from '~/app/shared/api/cephfs.service'; +import { ConfirmationModalComponent } from '~/app/shared/components/confirmation-modal/confirmation-modal.component'; +import { CriticalConfirmationModalComponent } from '~/app/shared/components/critical-confirmation-modal/critical-confirmation-modal.component'; +import { FormModalComponent } from '~/app/shared/components/form-modal/form-modal.component'; +import { NotificationType } from '~/app/shared/enum/notification-type.enum'; +import { CdValidators } from '~/app/shared/forms/cd-validators'; +import { CdTableAction } from '~/app/shared/models/cd-table-action'; +import { CdTableSelection } from '~/app/shared/models/cd-table-selection'; import { CephfsDir, CephfsQuotas, CephfsSnapshot -} from '../../../shared/models/cephfs-directory-models'; -import { ModalService } from '../../../shared/services/modal.service'; -import { NotificationService } from '../../../shared/services/notification.service'; -import { SharedModule } from '../../../shared/shared.module'; +} from '~/app/shared/models/cephfs-directory-models'; +import { ModalService } from '~/app/shared/services/modal.service'; +import { NotificationService } from '~/app/shared/services/notification.service'; +import { SharedModule } from '~/app/shared/shared.module'; import { CephfsDirectoriesComponent } from './cephfs-directories.component'; describe('CephfsDirectoriesComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-directories/cephfs-directories.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-directories/cephfs-directories.component.ts index 4cea553477f..498f63e8e8c 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-directories/cephfs-directories.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-directories/cephfs-directories.component.ts @@ -12,29 +12,29 @@ import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; import _ from 'lodash'; import moment from 'moment'; -import { CephfsService } from '../../../shared/api/cephfs.service'; -import { ConfirmationModalComponent } from '../../../shared/components/confirmation-modal/confirmation-modal.component'; -import { CriticalConfirmationModalComponent } from '../../../shared/components/critical-confirmation-modal/critical-confirmation-modal.component'; -import { FormModalComponent } from '../../../shared/components/form-modal/form-modal.component'; -import { ActionLabelsI18n } from '../../../shared/constants/app.constants'; -import { Icons } from '../../../shared/enum/icons.enum'; -import { NotificationType } from '../../../shared/enum/notification-type.enum'; -import { CdValidators } from '../../../shared/forms/cd-validators'; -import { CdFormModalFieldConfig } from '../../../shared/models/cd-form-modal-field-config'; -import { CdTableAction } from '../../../shared/models/cd-table-action'; -import { CdTableColumn } from '../../../shared/models/cd-table-column'; -import { CdTableSelection } from '../../../shared/models/cd-table-selection'; +import { CephfsService } from '~/app/shared/api/cephfs.service'; +import { ConfirmationModalComponent } from '~/app/shared/components/confirmation-modal/confirmation-modal.component'; +import { CriticalConfirmationModalComponent } from '~/app/shared/components/critical-confirmation-modal/critical-confirmation-modal.component'; +import { FormModalComponent } from '~/app/shared/components/form-modal/form-modal.component'; +import { ActionLabelsI18n } from '~/app/shared/constants/app.constants'; +import { Icons } from '~/app/shared/enum/icons.enum'; +import { NotificationType } from '~/app/shared/enum/notification-type.enum'; +import { CdValidators } from '~/app/shared/forms/cd-validators'; +import { CdFormModalFieldConfig } from '~/app/shared/models/cd-form-modal-field-config'; +import { CdTableAction } from '~/app/shared/models/cd-table-action'; +import { CdTableColumn } from '~/app/shared/models/cd-table-column'; +import { CdTableSelection } from '~/app/shared/models/cd-table-selection'; import { CephfsDir, CephfsQuotas, CephfsSnapshot -} from '../../../shared/models/cephfs-directory-models'; -import { Permission } from '../../../shared/models/permissions'; -import { CdDatePipe } from '../../../shared/pipes/cd-date.pipe'; -import { DimlessBinaryPipe } from '../../../shared/pipes/dimless-binary.pipe'; -import { AuthStorageService } from '../../../shared/services/auth-storage.service'; -import { ModalService } from '../../../shared/services/modal.service'; -import { NotificationService } from '../../../shared/services/notification.service'; +} from '~/app/shared/models/cephfs-directory-models'; +import { Permission } from '~/app/shared/models/permissions'; +import { CdDatePipe } from '~/app/shared/pipes/cd-date.pipe'; +import { DimlessBinaryPipe } from '~/app/shared/pipes/dimless-binary.pipe'; +import { AuthStorageService } from '~/app/shared/services/auth-storage.service'; +import { ModalService } from '~/app/shared/services/modal.service'; +import { NotificationService } from '~/app/shared/services/notification.service'; class QuotaSetting { row: { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-list/cephfs-list.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-list/cephfs-list.component.spec.ts index a8f87b6ba29..5e9d27022e8 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-list/cephfs-list.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-list/cephfs-list.component.spec.ts @@ -3,9 +3,9 @@ import { Component, Input } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -import { configureTestBed } from '../../../../testing/unit-test-helper'; -import { CdTableSelection } from '../../../shared/models/cd-table-selection'; -import { SharedModule } from '../../../shared/shared.module'; +import { configureTestBed } from '~/testing/unit-test-helper'; +import { CdTableSelection } from '~/app/shared/models/cd-table-selection'; +import { SharedModule } from '~/app/shared/shared.module'; import { CephfsListComponent } from './cephfs-list.component'; @Component({ selector: 'cd-cephfs-tabs', template: '' }) diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-list/cephfs-list.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-list/cephfs-list.component.ts index 4b19803d870..8d19d394c34 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-list/cephfs-list.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-list/cephfs-list.component.ts @@ -1,12 +1,12 @@ import { Component, OnInit } from '@angular/core'; -import { CephfsService } from '../../../shared/api/cephfs.service'; -import { ListWithDetails } from '../../../shared/classes/list-with-details.class'; -import { CellTemplate } from '../../../shared/enum/cell-template.enum'; -import { CdTableColumn } from '../../../shared/models/cd-table-column'; -import { CdTableFetchDataContext } from '../../../shared/models/cd-table-fetch-data-context'; -import { CdTableSelection } from '../../../shared/models/cd-table-selection'; -import { CdDatePipe } from '../../../shared/pipes/cd-date.pipe'; +import { CephfsService } from '~/app/shared/api/cephfs.service'; +import { ListWithDetails } from '~/app/shared/classes/list-with-details.class'; +import { CellTemplate } from '~/app/shared/enum/cell-template.enum'; +import { CdTableColumn } from '~/app/shared/models/cd-table-column'; +import { CdTableFetchDataContext } from '~/app/shared/models/cd-table-fetch-data-context'; +import { CdTableSelection } from '~/app/shared/models/cd-table-selection'; +import { CdDatePipe } from '~/app/shared/pipes/cd-date.pipe'; @Component({ selector: 'cd-cephfs-list', diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-tabs/cephfs-tabs.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-tabs/cephfs-tabs.component.spec.ts index ad66c4332a6..6193ba64c12 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-tabs/cephfs-tabs.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-tabs/cephfs-tabs.component.spec.ts @@ -8,11 +8,11 @@ import _ from 'lodash'; import { ToastrModule } from 'ngx-toastr'; import { of } from 'rxjs'; -import { configureTestBed } from '../../../../testing/unit-test-helper'; -import { CephfsService } from '../../../shared/api/cephfs.service'; -import { TableStatusViewCache } from '../../../shared/classes/table-status-view-cache'; -import { ViewCacheStatus } from '../../../shared/enum/view-cache-status.enum'; -import { SharedModule } from '../../../shared/shared.module'; +import { configureTestBed } from '~/testing/unit-test-helper'; +import { CephfsService } from '~/app/shared/api/cephfs.service'; +import { TableStatusViewCache } from '~/app/shared/classes/table-status-view-cache'; +import { ViewCacheStatus } from '~/app/shared/enum/view-cache-status.enum'; +import { SharedModule } from '~/app/shared/shared.module'; import { CephfsClientsComponent } from '../cephfs-clients/cephfs-clients.component'; import { CephfsDetailComponent } from '../cephfs-detail/cephfs-detail.component'; import { CephfsDirectoriesComponent } from '../cephfs-directories/cephfs-directories.component'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-tabs/cephfs-tabs.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-tabs/cephfs-tabs.component.ts index 0d313010c19..404ec20aac2 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-tabs/cephfs-tabs.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-tabs/cephfs-tabs.component.ts @@ -3,11 +3,11 @@ import { Component, Input, NgZone, OnChanges, OnDestroy } from '@angular/core'; import _ from 'lodash'; import { Subscription, timer } from 'rxjs'; -import { CephfsService } from '../../../shared/api/cephfs.service'; -import { TableStatusViewCache } from '../../../shared/classes/table-status-view-cache'; -import { ViewCacheStatus } from '../../../shared/enum/view-cache-status.enum'; -import { Permission } from '../../../shared/models/permissions'; -import { AuthStorageService } from '../../../shared/services/auth-storage.service'; +import { CephfsService } from '~/app/shared/api/cephfs.service'; +import { TableStatusViewCache } from '~/app/shared/classes/table-status-view-cache'; +import { ViewCacheStatus } from '~/app/shared/enum/view-cache-status.enum'; +import { Permission } from '~/app/shared/models/permissions'; +import { AuthStorageService } from '~/app/shared/services/auth-storage.service'; @Component({ selector: 'cd-cephfs-tabs', diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs.module.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs.module.ts index 61130957da3..41b58a0a36b 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs.module.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs.module.ts @@ -5,8 +5,8 @@ import { TreeModule } from '@circlon/angular-tree-component'; import { NgbNavModule } from '@ng-bootstrap/ng-bootstrap'; import { ChartsModule } from 'ng2-charts'; -import { AppRoutingModule } from '../../app-routing.module'; -import { SharedModule } from '../../shared/shared.module'; +import { AppRoutingModule } from '~/app/app-routing.module'; +import { SharedModule } from '~/app/shared/shared.module'; import { CephfsChartComponent } from './cephfs-chart/cephfs-chart.component'; import { CephfsClientsComponent } from './cephfs-clients/cephfs-clients.component'; import { CephfsDetailComponent } from './cephfs-detail/cephfs-detail.component'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/cluster.module.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/cluster.module.ts index 3d0b69551a5..62464cadefe 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/cluster.module.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/cluster.module.ts @@ -14,7 +14,7 @@ import { NgbTypeaheadModule } from '@ng-bootstrap/ng-bootstrap'; -import { SharedModule } from '../../shared/shared.module'; +import { SharedModule } from '~/app/shared/shared.module'; import { PerformanceCounterModule } from '../performance-counter/performance-counter.module'; import { CephSharedModule } from '../shared/ceph-shared.module'; import { ConfigurationDetailsComponent } from './configuration/configuration-details/configuration-details.component'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/configuration/configuration-details/configuration-details.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/configuration/configuration-details/configuration-details.component.spec.ts index 5e079e81440..2f0af172fa5 100755 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/configuration/configuration-details/configuration-details.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/configuration/configuration-details/configuration-details.component.spec.ts @@ -1,8 +1,8 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { configureTestBed } from '../../../../../testing/unit-test-helper'; -import { DataTableModule } from '../../../../shared/datatable/datatable.module'; -import { SharedModule } from '../../../../shared/shared.module'; +import { configureTestBed } from '~/testing/unit-test-helper'; +import { DataTableModule } from '~/app/shared/datatable/datatable.module'; +import { SharedModule } from '~/app/shared/shared.module'; import { ConfigurationDetailsComponent } from './configuration-details.component'; describe('ConfigurationDetailsComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/configuration/configuration-form/configuration-form.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/configuration/configuration-form/configuration-form.component.spec.ts index d6fd507f839..b209d87a105 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/configuration/configuration-form/configuration-form.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/configuration/configuration-form/configuration-form.component.spec.ts @@ -6,9 +6,9 @@ import { RouterTestingModule } from '@angular/router/testing'; import { ToastrModule } from 'ngx-toastr'; -import { configureTestBed } from '../../../../../testing/unit-test-helper'; -import { ConfigFormModel } from '../../../../shared/components/config-option/config-option.model'; -import { SharedModule } from '../../../../shared/shared.module'; +import { configureTestBed } from '~/testing/unit-test-helper'; +import { ConfigFormModel } from '~/app/shared/components/config-option/config-option.model'; +import { SharedModule } from '~/app/shared/shared.module'; import { ConfigurationFormComponent } from './configuration-form.component'; describe('ConfigurationFormComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/configuration/configuration-form/configuration-form.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/configuration/configuration-form/configuration-form.component.ts index 6bb71597e50..aef0eceb557 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/configuration/configuration-form/configuration-form.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/configuration/configuration-form/configuration-form.component.ts @@ -4,13 +4,13 @@ import { ActivatedRoute, Router } from '@angular/router'; import _ from 'lodash'; -import { ConfigurationService } from '../../../../shared/api/configuration.service'; -import { ConfigFormModel } from '../../../../shared/components/config-option/config-option.model'; -import { ConfigOptionTypes } from '../../../../shared/components/config-option/config-option.types'; -import { NotificationType } from '../../../../shared/enum/notification-type.enum'; -import { CdForm } from '../../../../shared/forms/cd-form'; -import { CdFormGroup } from '../../../../shared/forms/cd-form-group'; -import { NotificationService } from '../../../../shared/services/notification.service'; +import { ConfigurationService } from '~/app/shared/api/configuration.service'; +import { ConfigFormModel } from '~/app/shared/components/config-option/config-option.model'; +import { ConfigOptionTypes } from '~/app/shared/components/config-option/config-option.types'; +import { NotificationType } from '~/app/shared/enum/notification-type.enum'; +import { CdForm } from '~/app/shared/forms/cd-form'; +import { CdFormGroup } from '~/app/shared/forms/cd-form-group'; +import { NotificationService } from '~/app/shared/services/notification.service'; import { ConfigFormCreateRequestModel } from './configuration-form-create-request.model'; @Component({ diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/configuration/configuration.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/configuration/configuration.component.spec.ts index 0aa03948562..07492a7e1a1 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/configuration/configuration.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/configuration/configuration.component.spec.ts @@ -7,8 +7,8 @@ import { RouterTestingModule } from '@angular/router/testing'; import { NgbNavModule } from '@ng-bootstrap/ng-bootstrap'; -import { configureTestBed } from '../../../../testing/unit-test-helper'; -import { SharedModule } from '../../../shared/shared.module'; +import { configureTestBed } from '~/testing/unit-test-helper'; +import { SharedModule } from '~/app/shared/shared.module'; import { ConfigurationDetailsComponent } from './configuration-details/configuration-details.component'; import { ConfigurationComponent } from './configuration.component'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/configuration/configuration.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/configuration/configuration.component.ts index f32c1b0e966..a57603d4c8a 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/configuration/configuration.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/configuration/configuration.component.ts @@ -1,16 +1,16 @@ import { Component, OnInit, TemplateRef, ViewChild } from '@angular/core'; -import { ConfigurationService } from '../../../shared/api/configuration.service'; -import { ListWithDetails } from '../../../shared/classes/list-with-details.class'; -import { ActionLabelsI18n } from '../../../shared/constants/app.constants'; -import { CellTemplate } from '../../../shared/enum/cell-template.enum'; -import { Icons } from '../../../shared/enum/icons.enum'; -import { CdTableAction } from '../../../shared/models/cd-table-action'; -import { CdTableColumn } from '../../../shared/models/cd-table-column'; -import { CdTableFetchDataContext } from '../../../shared/models/cd-table-fetch-data-context'; -import { CdTableSelection } from '../../../shared/models/cd-table-selection'; -import { Permission } from '../../../shared/models/permissions'; -import { AuthStorageService } from '../../../shared/services/auth-storage.service'; +import { ConfigurationService } from '~/app/shared/api/configuration.service'; +import { ListWithDetails } from '~/app/shared/classes/list-with-details.class'; +import { ActionLabelsI18n } from '~/app/shared/constants/app.constants'; +import { CellTemplate } from '~/app/shared/enum/cell-template.enum'; +import { Icons } from '~/app/shared/enum/icons.enum'; +import { CdTableAction } from '~/app/shared/models/cd-table-action'; +import { CdTableColumn } from '~/app/shared/models/cd-table-column'; +import { CdTableFetchDataContext } from '~/app/shared/models/cd-table-fetch-data-context'; +import { CdTableSelection } from '~/app/shared/models/cd-table-selection'; +import { Permission } from '~/app/shared/models/permissions'; +import { AuthStorageService } from '~/app/shared/services/auth-storage.service'; @Component({ selector: 'cd-configuration', diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/crushmap/crushmap.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/crushmap/crushmap.component.spec.ts index 0071d7c56f0..fa25f098ffa 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/crushmap/crushmap.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/crushmap/crushmap.component.spec.ts @@ -5,9 +5,9 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { TreeModule } from '@circlon/angular-tree-component'; import { of } from 'rxjs'; -import { configureTestBed } from '../../../../testing/unit-test-helper'; -import { HealthService } from '../../../shared/api/health.service'; -import { SharedModule } from '../../../shared/shared.module'; +import { configureTestBed } from '~/testing/unit-test-helper'; +import { HealthService } from '~/app/shared/api/health.service'; +import { SharedModule } from '~/app/shared/shared.module'; import { CrushmapComponent } from './crushmap.component'; describe('CrushmapComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/crushmap/crushmap.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/crushmap/crushmap.component.ts index b64381bd746..cd069c7ac6c 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/crushmap/crushmap.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/crushmap/crushmap.component.ts @@ -8,8 +8,8 @@ import { TREE_ACTIONS } from '@circlon/angular-tree-component'; -import { HealthService } from '../../../shared/api/health.service'; -import { Icons } from '../../../shared/enum/icons.enum'; +import { HealthService } from '~/app/shared/api/health.service'; +import { Icons } from '~/app/shared/enum/icons.enum'; @Component({ selector: 'cd-crushmap', diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/hosts/host-details/host-details.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/hosts/host-details/host-details.component.spec.ts index 26a428191ac..8fdfe313627 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/hosts/host-details/host-details.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/hosts/host-details/host-details.component.spec.ts @@ -5,12 +5,12 @@ import { RouterTestingModule } from '@angular/router/testing'; import { ToastrModule } from 'ngx-toastr'; -import { configureTestBed, TabHelper } from '../../../../../testing/unit-test-helper'; -import { CoreModule } from '../../../../core/core.module'; -import { Permissions } from '../../../../shared/models/permissions'; -import { SharedModule } from '../../../../shared/shared.module'; -import { CephModule } from '../../../ceph.module'; -import { CephSharedModule } from '../../../shared/ceph-shared.module'; +import { configureTestBed, TabHelper } from '~/testing/unit-test-helper'; +import { CoreModule } from '~/app/core/core.module'; +import { Permissions } from '~/app/shared/models/permissions'; +import { SharedModule } from '~/app/shared/shared.module'; +import { CephModule } from '~/app/ceph/ceph.module'; +import { CephSharedModule } from '~/app/ceph/shared/ceph-shared.module'; import { HostDetailsComponent } from './host-details.component'; describe('HostDetailsComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/hosts/host-details/host-details.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/hosts/host-details/host-details.component.ts index 15ef44b2a2c..bc66bdaab00 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/hosts/host-details/host-details.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/hosts/host-details/host-details.component.ts @@ -1,6 +1,6 @@ import { Component, Input } from '@angular/core'; -import { Permissions } from '../../../../shared/models/permissions'; +import { Permissions } from '~/app/shared/models/permissions'; @Component({ selector: 'cd-host-details', diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/hosts/host-form/host-form.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/hosts/host-form/host-form.component.spec.ts index 9586beadde0..b5b0f48f337 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/hosts/host-form/host-form.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/hosts/host-form/host-form.component.spec.ts @@ -5,9 +5,9 @@ import { RouterTestingModule } from '@angular/router/testing'; import { ToastrModule } from 'ngx-toastr'; -import { configureTestBed } from '../../../../../testing/unit-test-helper'; -import { LoadingPanelComponent } from '../../../../shared/components/loading-panel/loading-panel.component'; -import { SharedModule } from '../../../../shared/shared.module'; +import { configureTestBed } from '~/testing/unit-test-helper'; +import { LoadingPanelComponent } from '~/app/shared/components/loading-panel/loading-panel.component'; +import { SharedModule } from '~/app/shared/shared.module'; import { HostFormComponent } from './host-form.component'; describe('HostFormComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/hosts/host-form/host-form.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/hosts/host-form/host-form.component.ts index d0118fe114c..04b6d82ca0c 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/hosts/host-form/host-form.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/hosts/host-form/host-form.component.ts @@ -2,13 +2,13 @@ import { Component, OnInit } from '@angular/core'; import { FormControl, Validators } from '@angular/forms'; import { Router } from '@angular/router'; -import { HostService } from '../../../../shared/api/host.service'; -import { ActionLabelsI18n, URLVerbs } from '../../../../shared/constants/app.constants'; -import { CdForm } from '../../../../shared/forms/cd-form'; -import { CdFormGroup } from '../../../../shared/forms/cd-form-group'; -import { CdValidators } from '../../../../shared/forms/cd-validators'; -import { FinishedTask } from '../../../../shared/models/finished-task'; -import { TaskWrapperService } from '../../../../shared/services/task-wrapper.service'; +import { HostService } from '~/app/shared/api/host.service'; +import { ActionLabelsI18n, URLVerbs } from '~/app/shared/constants/app.constants'; +import { CdForm } from '~/app/shared/forms/cd-form'; +import { CdFormGroup } from '~/app/shared/forms/cd-form-group'; +import { CdValidators } from '~/app/shared/forms/cd-validators'; +import { FinishedTask } from '~/app/shared/models/finished-task'; +import { TaskWrapperService } from '~/app/shared/services/task-wrapper.service'; @Component({ selector: 'cd-host-form', diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/hosts/hosts.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/hosts/hosts.component.spec.ts index 861ae203123..e225e5df6be 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/hosts/hosts.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/hosts/hosts.component.spec.ts @@ -10,18 +10,18 @@ import { configureTestBed, OrchestratorHelper, TableActionHelper -} from '../../../../testing/unit-test-helper'; -import { CoreModule } from '../../../core/core.module'; -import { HostService } from '../../../shared/api/host.service'; -import { OrchestratorService } from '../../../shared/api/orchestrator.service'; -import { TableActionsComponent } from '../../../shared/datatable/table-actions/table-actions.component'; -import { CdTableSelection } from '../../../shared/models/cd-table-selection'; -import { OrchestratorFeature } from '../../../shared/models/orchestrator.enum'; -import { Permissions } from '../../../shared/models/permissions'; -import { AuthStorageService } from '../../../shared/services/auth-storage.service'; -import { SharedModule } from '../../../shared/shared.module'; -import { CephModule } from '../../ceph.module'; -import { CephSharedModule } from '../../shared/ceph-shared.module'; +} from '~/testing/unit-test-helper'; +import { CoreModule } from '~/app/core/core.module'; +import { HostService } from '~/app/shared/api/host.service'; +import { OrchestratorService } from '~/app/shared/api/orchestrator.service'; +import { TableActionsComponent } from '~/app/shared/datatable/table-actions/table-actions.component'; +import { CdTableSelection } from '~/app/shared/models/cd-table-selection'; +import { OrchestratorFeature } from '~/app/shared/models/orchestrator.enum'; +import { Permissions } from '~/app/shared/models/permissions'; +import { AuthStorageService } from '~/app/shared/services/auth-storage.service'; +import { SharedModule } from '~/app/shared/shared.module'; +import { CephModule } from '~/app/ceph/ceph.module'; +import { CephSharedModule } from '~/app/ceph/shared/ceph-shared.module'; import { HostsComponent } from './hosts.component'; describe('HostsComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/hosts/hosts.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/hosts/hosts.component.ts index 9848545014d..8ed8db0301c 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/hosts/hosts.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/hosts/hosts.component.ts @@ -4,31 +4,31 @@ import { Router } from '@angular/router'; import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; import _ from 'lodash'; -import { HostService } from '../../../shared/api/host.service'; -import { OrchestratorService } from '../../../shared/api/orchestrator.service'; -import { ListWithDetails } from '../../../shared/classes/list-with-details.class'; -import { CriticalConfirmationModalComponent } from '../../../shared/components/critical-confirmation-modal/critical-confirmation-modal.component'; -import { FormModalComponent } from '../../../shared/components/form-modal/form-modal.component'; -import { SelectMessages } from '../../../shared/components/select/select-messages.model'; -import { ActionLabelsI18n } from '../../../shared/constants/app.constants'; -import { TableComponent } from '../../../shared/datatable/table/table.component'; -import { Icons } from '../../../shared/enum/icons.enum'; -import { NotificationType } from '../../../shared/enum/notification-type.enum'; -import { CdTableAction } from '../../../shared/models/cd-table-action'; -import { CdTableColumn } from '../../../shared/models/cd-table-column'; -import { CdTableFetchDataContext } from '../../../shared/models/cd-table-fetch-data-context'; -import { CdTableSelection } from '../../../shared/models/cd-table-selection'; -import { FinishedTask } from '../../../shared/models/finished-task'; -import { OrchestratorFeature } from '../../../shared/models/orchestrator.enum'; -import { OrchestratorStatus } from '../../../shared/models/orchestrator.interface'; -import { Permissions } from '../../../shared/models/permissions'; -import { CephShortVersionPipe } from '../../../shared/pipes/ceph-short-version.pipe'; -import { JoinPipe } from '../../../shared/pipes/join.pipe'; -import { AuthStorageService } from '../../../shared/services/auth-storage.service'; -import { ModalService } from '../../../shared/services/modal.service'; -import { NotificationService } from '../../../shared/services/notification.service'; -import { TaskWrapperService } from '../../../shared/services/task-wrapper.service'; -import { URLBuilderService } from '../../../shared/services/url-builder.service'; +import { HostService } from '~/app/shared/api/host.service'; +import { OrchestratorService } from '~/app/shared/api/orchestrator.service'; +import { ListWithDetails } from '~/app/shared/classes/list-with-details.class'; +import { CriticalConfirmationModalComponent } from '~/app/shared/components/critical-confirmation-modal/critical-confirmation-modal.component'; +import { FormModalComponent } from '~/app/shared/components/form-modal/form-modal.component'; +import { SelectMessages } from '~/app/shared/components/select/select-messages.model'; +import { ActionLabelsI18n } from '~/app/shared/constants/app.constants'; +import { TableComponent } from '~/app/shared/datatable/table/table.component'; +import { Icons } from '~/app/shared/enum/icons.enum'; +import { NotificationType } from '~/app/shared/enum/notification-type.enum'; +import { CdTableAction } from '~/app/shared/models/cd-table-action'; +import { CdTableColumn } from '~/app/shared/models/cd-table-column'; +import { CdTableFetchDataContext } from '~/app/shared/models/cd-table-fetch-data-context'; +import { CdTableSelection } from '~/app/shared/models/cd-table-selection'; +import { FinishedTask } from '~/app/shared/models/finished-task'; +import { OrchestratorFeature } from '~/app/shared/models/orchestrator.enum'; +import { OrchestratorStatus } from '~/app/shared/models/orchestrator.interface'; +import { Permissions } from '~/app/shared/models/permissions'; +import { CephShortVersionPipe } from '~/app/shared/pipes/ceph-short-version.pipe'; +import { JoinPipe } from '~/app/shared/pipes/join.pipe'; +import { AuthStorageService } from '~/app/shared/services/auth-storage.service'; +import { ModalService } from '~/app/shared/services/modal.service'; +import { NotificationService } from '~/app/shared/services/notification.service'; +import { TaskWrapperService } from '~/app/shared/services/task-wrapper.service'; +import { URLBuilderService } from '~/app/shared/services/url-builder.service'; const BASE_URL = 'hosts'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/inventory/inventory-devices/inventory-devices.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/inventory/inventory-devices/inventory-devices.component.spec.ts index 58a6cf1698e..a9566d6e994 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/inventory/inventory-devices/inventory-devices.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/inventory/inventory-devices/inventory-devices.component.spec.ts @@ -7,16 +7,16 @@ import { RouterTestingModule } from '@angular/router/testing'; import { ToastrModule } from 'ngx-toastr'; -import { configureTestBed } from '../../../../../testing/unit-test-helper'; -import { OrchestratorService } from '../../../../shared/api/orchestrator.service'; -import { TableActionsComponent } from '../../../../shared/datatable/table-actions/table-actions.component'; -import { CdTableAction } from '../../../../shared/models/cd-table-action'; -import { CdTableSelection } from '../../../../shared/models/cd-table-selection'; -import { OrchestratorFeature } from '../../../../shared/models/orchestrator.enum'; -import { OrchestratorStatus } from '../../../../shared/models/orchestrator.interface'; -import { Permissions } from '../../../../shared/models/permissions'; -import { AuthStorageService } from '../../../../shared/services/auth-storage.service'; -import { SharedModule } from '../../../../shared/shared.module'; +import { configureTestBed } from '~/testing/unit-test-helper'; +import { OrchestratorService } from '~/app/shared/api/orchestrator.service'; +import { TableActionsComponent } from '~/app/shared/datatable/table-actions/table-actions.component'; +import { CdTableAction } from '~/app/shared/models/cd-table-action'; +import { CdTableSelection } from '~/app/shared/models/cd-table-selection'; +import { OrchestratorFeature } from '~/app/shared/models/orchestrator.enum'; +import { OrchestratorStatus } from '~/app/shared/models/orchestrator.interface'; +import { Permissions } from '~/app/shared/models/permissions'; +import { AuthStorageService } from '~/app/shared/services/auth-storage.service'; +import { SharedModule } from '~/app/shared/shared.module'; import { InventoryDevicesComponent } from './inventory-devices.component'; describe('InventoryDevicesComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/inventory/inventory-devices/inventory-devices.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/inventory/inventory-devices/inventory-devices.component.ts index e19ad08879e..669a9bc89e2 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/inventory/inventory-devices/inventory-devices.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/inventory/inventory-devices/inventory-devices.component.ts @@ -11,23 +11,23 @@ import { import _ from 'lodash'; import { Subscription } from 'rxjs'; -import { OrchestratorService } from '../../../../shared/api/orchestrator.service'; -import { FormModalComponent } from '../../../../shared/components/form-modal/form-modal.component'; -import { TableComponent } from '../../../../shared/datatable/table/table.component'; -import { CellTemplate } from '../../../../shared/enum/cell-template.enum'; -import { Icons } from '../../../../shared/enum/icons.enum'; -import { NotificationType } from '../../../../shared/enum/notification-type.enum'; -import { CdTableAction } from '../../../../shared/models/cd-table-action'; -import { CdTableColumn } from '../../../../shared/models/cd-table-column'; -import { CdTableColumnFiltersChange } from '../../../../shared/models/cd-table-column-filters-change'; -import { CdTableSelection } from '../../../../shared/models/cd-table-selection'; -import { OrchestratorFeature } from '../../../../shared/models/orchestrator.enum'; -import { OrchestratorStatus } from '../../../../shared/models/orchestrator.interface'; -import { Permission } from '../../../../shared/models/permissions'; -import { DimlessBinaryPipe } from '../../../../shared/pipes/dimless-binary.pipe'; -import { AuthStorageService } from '../../../../shared/services/auth-storage.service'; -import { ModalService } from '../../../../shared/services/modal.service'; -import { NotificationService } from '../../../../shared/services/notification.service'; +import { OrchestratorService } from '~/app/shared/api/orchestrator.service'; +import { FormModalComponent } from '~/app/shared/components/form-modal/form-modal.component'; +import { TableComponent } from '~/app/shared/datatable/table/table.component'; +import { CellTemplate } from '~/app/shared/enum/cell-template.enum'; +import { Icons } from '~/app/shared/enum/icons.enum'; +import { NotificationType } from '~/app/shared/enum/notification-type.enum'; +import { CdTableAction } from '~/app/shared/models/cd-table-action'; +import { CdTableColumn } from '~/app/shared/models/cd-table-column'; +import { CdTableColumnFiltersChange } from '~/app/shared/models/cd-table-column-filters-change'; +import { CdTableSelection } from '~/app/shared/models/cd-table-selection'; +import { OrchestratorFeature } from '~/app/shared/models/orchestrator.enum'; +import { OrchestratorStatus } from '~/app/shared/models/orchestrator.interface'; +import { Permission } from '~/app/shared/models/permissions'; +import { DimlessBinaryPipe } from '~/app/shared/pipes/dimless-binary.pipe'; +import { AuthStorageService } from '~/app/shared/services/auth-storage.service'; +import { ModalService } from '~/app/shared/services/modal.service'; +import { NotificationService } from '~/app/shared/services/notification.service'; import { InventoryDevice } from './inventory-device.model'; @Component({ diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/inventory/inventory.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/inventory/inventory.component.spec.ts index 8b983e5ab27..c45967a1a66 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/inventory/inventory.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/inventory/inventory.component.spec.ts @@ -7,9 +7,9 @@ import { RouterTestingModule } from '@angular/router/testing'; import { ToastrModule } from 'ngx-toastr'; import { of } from 'rxjs'; -import { configureTestBed } from '../../../../testing/unit-test-helper'; -import { OrchestratorService } from '../../../shared/api/orchestrator.service'; -import { SharedModule } from '../../../shared/shared.module'; +import { configureTestBed } from '~/testing/unit-test-helper'; +import { OrchestratorService } from '~/app/shared/api/orchestrator.service'; +import { SharedModule } from '~/app/shared/shared.module'; import { InventoryDevicesComponent } from './inventory-devices/inventory-devices.component'; import { InventoryComponent } from './inventory.component'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/inventory/inventory.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/inventory/inventory.component.ts index 9f6cb2c9c87..edf7f61e107 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/inventory/inventory.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/inventory/inventory.component.ts @@ -2,9 +2,9 @@ import { Component, Input, NgZone, OnChanges, OnDestroy, OnInit } from '@angular import { Subscription, timer as observableTimer } from 'rxjs'; -import { OrchestratorService } from '../../../shared/api/orchestrator.service'; -import { Icons } from '../../../shared/enum/icons.enum'; -import { OrchestratorStatus } from '../../../shared/models/orchestrator.interface'; +import { OrchestratorService } from '~/app/shared/api/orchestrator.service'; +import { Icons } from '~/app/shared/enum/icons.enum'; +import { OrchestratorStatus } from '~/app/shared/models/orchestrator.interface'; import { InventoryDevice } from './inventory-devices/inventory-device.model'; @Component({ diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/logs/logs.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/logs/logs.component.spec.ts index 2f15056f83b..607fe992893 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/logs/logs.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/logs/logs.component.spec.ts @@ -4,8 +4,8 @@ import { FormsModule } from '@angular/forms'; import { NgbDatepickerModule, NgbNavModule, NgbTimepickerModule } from '@ng-bootstrap/ng-bootstrap'; -import { configureTestBed } from '../../../../testing/unit-test-helper'; -import { SharedModule } from '../../../shared/shared.module'; +import { configureTestBed } from '~/testing/unit-test-helper'; +import { SharedModule } from '~/app/shared/shared.module'; import { LogsComponent } from './logs.component'; describe('LogsComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/logs/logs.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/logs/logs.component.ts index c298af22ab4..4b10ffad920 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/logs/logs.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/logs/logs.component.ts @@ -3,8 +3,8 @@ import { Component, NgZone, OnDestroy, OnInit } from '@angular/core'; import { NgbDateStruct } from '@ng-bootstrap/ng-bootstrap'; -import { LogsService } from '../../../shared/api/logs.service'; -import { Icons } from '../../../shared/enum/icons.enum'; +import { LogsService } from '~/app/shared/api/logs.service'; +import { Icons } from '~/app/shared/enum/icons.enum'; @Component({ selector: 'cd-logs', diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/mgr-modules/mgr-module-details/mgr-module-details.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/mgr-modules/mgr-module-details/mgr-module-details.component.spec.ts index ff6473ed133..ebbe162f116 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/mgr-modules/mgr-module-details/mgr-module-details.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/mgr-modules/mgr-module-details/mgr-module-details.component.spec.ts @@ -1,8 +1,8 @@ import { HttpClientTestingModule } from '@angular/common/http/testing'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { configureTestBed } from '../../../../../testing/unit-test-helper'; -import { SharedModule } from '../../../../shared/shared.module'; +import { configureTestBed } from '~/testing/unit-test-helper'; +import { SharedModule } from '~/app/shared/shared.module'; import { MgrModuleDetailsComponent } from './mgr-module-details.component'; describe('MgrModuleDetailsComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/mgr-modules/mgr-module-details/mgr-module-details.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/mgr-modules/mgr-module-details/mgr-module-details.component.ts index dbe2066e4a3..5a08ebedd72 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/mgr-modules/mgr-module-details/mgr-module-details.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/mgr-modules/mgr-module-details/mgr-module-details.component.ts @@ -1,6 +1,6 @@ import { Component, Input, OnChanges } from '@angular/core'; -import { MgrModuleService } from '../../../../shared/api/mgr-module.service'; +import { MgrModuleService } from '~/app/shared/api/mgr-module.service'; @Component({ selector: 'cd-mgr-module-details', diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/mgr-modules/mgr-module-form/mgr-module-form.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/mgr-modules/mgr-module-form/mgr-module-form.component.spec.ts index 18168a686e6..e295f315f0d 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/mgr-modules/mgr-module-form/mgr-module-form.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/mgr-modules/mgr-module-form/mgr-module-form.component.spec.ts @@ -5,9 +5,9 @@ import { RouterTestingModule } from '@angular/router/testing'; import { ToastrModule } from 'ngx-toastr'; -import { configureTestBed } from '../../../../../testing/unit-test-helper'; -import { LoadingPanelComponent } from '../../../../shared/components/loading-panel/loading-panel.component'; -import { SharedModule } from '../../../../shared/shared.module'; +import { configureTestBed } from '~/testing/unit-test-helper'; +import { LoadingPanelComponent } from '~/app/shared/components/loading-panel/loading-panel.component'; +import { SharedModule } from '~/app/shared/shared.module'; import { MgrModuleFormComponent } from './mgr-module-form.component'; describe('MgrModuleFormComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/mgr-modules/mgr-module-form/mgr-module-form.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/mgr-modules/mgr-module-form/mgr-module-form.component.ts index 2fdb9aced61..b07cc46bb38 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/mgr-modules/mgr-module-form/mgr-module-form.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/mgr-modules/mgr-module-form/mgr-module-form.component.ts @@ -5,13 +5,13 @@ import { ActivatedRoute, Router } from '@angular/router'; import _ from 'lodash'; import { forkJoin as observableForkJoin } from 'rxjs'; -import { MgrModuleService } from '../../../../shared/api/mgr-module.service'; -import { NotificationType } from '../../../../shared/enum/notification-type.enum'; -import { CdForm } from '../../../../shared/forms/cd-form'; -import { CdFormBuilder } from '../../../../shared/forms/cd-form-builder'; -import { CdFormGroup } from '../../../../shared/forms/cd-form-group'; -import { CdValidators } from '../../../../shared/forms/cd-validators'; -import { NotificationService } from '../../../../shared/services/notification.service'; +import { MgrModuleService } from '~/app/shared/api/mgr-module.service'; +import { NotificationType } from '~/app/shared/enum/notification-type.enum'; +import { CdForm } from '~/app/shared/forms/cd-form'; +import { CdFormBuilder } from '~/app/shared/forms/cd-form-builder'; +import { CdFormGroup } from '~/app/shared/forms/cd-form-group'; +import { CdValidators } from '~/app/shared/forms/cd-validators'; +import { NotificationService } from '~/app/shared/services/notification.service'; @Component({ selector: 'cd-mgr-module-form', diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/mgr-modules/mgr-module-list/mgr-module-list.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/mgr-modules/mgr-module-list/mgr-module-list.component.spec.ts index 46f633487ac..8971b7cdfd3 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/mgr-modules/mgr-module-list/mgr-module-list.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/mgr-modules/mgr-module-list/mgr-module-list.component.spec.ts @@ -7,12 +7,12 @@ import { NgbNavModule } from '@ng-bootstrap/ng-bootstrap'; import { ToastrModule } from 'ngx-toastr'; import { of as observableOf, throwError as observableThrowError } from 'rxjs'; -import { configureTestBed, PermissionHelper } from '../../../../../testing/unit-test-helper'; -import { MgrModuleService } from '../../../../shared/api/mgr-module.service'; -import { TableActionsComponent } from '../../../../shared/datatable/table-actions/table-actions.component'; -import { CdTableSelection } from '../../../../shared/models/cd-table-selection'; -import { NotificationService } from '../../../../shared/services/notification.service'; -import { SharedModule } from '../../../../shared/shared.module'; +import { configureTestBed, PermissionHelper } from '~/testing/unit-test-helper'; +import { MgrModuleService } from '~/app/shared/api/mgr-module.service'; +import { TableActionsComponent } from '~/app/shared/datatable/table-actions/table-actions.component'; +import { CdTableSelection } from '~/app/shared/models/cd-table-selection'; +import { NotificationService } from '~/app/shared/services/notification.service'; +import { SharedModule } from '~/app/shared/shared.module'; import { MgrModuleDetailsComponent } from '../mgr-module-details/mgr-module-details.component'; import { MgrModuleListComponent } from './mgr-module-list.component'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/mgr-modules/mgr-module-list/mgr-module-list.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/mgr-modules/mgr-module-list/mgr-module-list.component.ts index 636f1317041..915e54923a1 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/mgr-modules/mgr-module-list/mgr-module-list.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/mgr-modules/mgr-module-list/mgr-module-list.component.ts @@ -3,18 +3,18 @@ import { Component, ViewChild } from '@angular/core'; import { BlockUI, NgBlockUI } from 'ng-block-ui'; import { timer as observableTimer } from 'rxjs'; -import { MgrModuleService } from '../../../../shared/api/mgr-module.service'; -import { ListWithDetails } from '../../../../shared/classes/list-with-details.class'; -import { TableComponent } from '../../../../shared/datatable/table/table.component'; -import { CellTemplate } from '../../../../shared/enum/cell-template.enum'; -import { Icons } from '../../../../shared/enum/icons.enum'; -import { CdTableAction } from '../../../../shared/models/cd-table-action'; -import { CdTableColumn } from '../../../../shared/models/cd-table-column'; -import { CdTableFetchDataContext } from '../../../../shared/models/cd-table-fetch-data-context'; -import { CdTableSelection } from '../../../../shared/models/cd-table-selection'; -import { Permission } from '../../../../shared/models/permissions'; -import { AuthStorageService } from '../../../../shared/services/auth-storage.service'; -import { NotificationService } from '../../../../shared/services/notification.service'; +import { MgrModuleService } from '~/app/shared/api/mgr-module.service'; +import { ListWithDetails } from '~/app/shared/classes/list-with-details.class'; +import { TableComponent } from '~/app/shared/datatable/table/table.component'; +import { CellTemplate } from '~/app/shared/enum/cell-template.enum'; +import { Icons } from '~/app/shared/enum/icons.enum'; +import { CdTableAction } from '~/app/shared/models/cd-table-action'; +import { CdTableColumn } from '~/app/shared/models/cd-table-column'; +import { CdTableFetchDataContext } from '~/app/shared/models/cd-table-fetch-data-context'; +import { CdTableSelection } from '~/app/shared/models/cd-table-selection'; +import { Permission } from '~/app/shared/models/permissions'; +import { AuthStorageService } from '~/app/shared/services/auth-storage.service'; +import { NotificationService } from '~/app/shared/services/notification.service'; @Component({ selector: 'cd-mgr-module-list', diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/mgr-modules/mgr-modules.module.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/mgr-modules/mgr-modules.module.ts index 97cca0f4438..9921db6d7bb 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/mgr-modules/mgr-modules.module.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/mgr-modules/mgr-modules.module.ts @@ -4,8 +4,8 @@ import { ReactiveFormsModule } from '@angular/forms'; import { NgbNavModule } from '@ng-bootstrap/ng-bootstrap'; -import { AppRoutingModule } from '../../../app-routing.module'; -import { SharedModule } from '../../../shared/shared.module'; +import { AppRoutingModule } from '~/app/app-routing.module'; +import { SharedModule } from '~/app/shared/shared.module'; import { MgrModuleDetailsComponent } from './mgr-module-details/mgr-module-details.component'; import { MgrModuleFormComponent } from './mgr-module-form/mgr-module-form.component'; import { MgrModuleListComponent } from './mgr-module-list/mgr-module-list.component'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/monitor/monitor.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/monitor/monitor.component.spec.ts index d3e203acea2..28858e80c3e 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/monitor/monitor.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/monitor/monitor.component.spec.ts @@ -4,9 +4,9 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { of } from 'rxjs'; -import { configureTestBed } from '../../../../testing/unit-test-helper'; -import { MonitorService } from '../../../shared/api/monitor.service'; -import { SharedModule } from '../../../shared/shared.module'; +import { configureTestBed } from '~/testing/unit-test-helper'; +import { MonitorService } from '~/app/shared/api/monitor.service'; +import { SharedModule } from '~/app/shared/shared.module'; import { MonitorComponent } from './monitor.component'; describe('MonitorComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/monitor/monitor.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/monitor/monitor.component.ts index 841634d71bc..5ba17e6c532 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/monitor/monitor.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/monitor/monitor.component.ts @@ -2,8 +2,8 @@ import { Component } from '@angular/core'; import _ from 'lodash'; -import { MonitorService } from '../../../shared/api/monitor.service'; -import { CellTemplate } from '../../../shared/enum/cell-template.enum'; +import { MonitorService } from '~/app/shared/api/monitor.service'; +import { CellTemplate } from '~/app/shared/enum/cell-template.enum'; @Component({ selector: 'cd-monitor', diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-creation-preview-modal/osd-creation-preview-modal.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-creation-preview-modal/osd-creation-preview-modal.component.spec.ts index 1f6ecd143d4..cf59b2aba3b 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-creation-preview-modal/osd-creation-preview-modal.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-creation-preview-modal/osd-creation-preview-modal.component.spec.ts @@ -6,8 +6,8 @@ import { RouterTestingModule } from '@angular/router/testing'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { ToastrModule } from 'ngx-toastr'; -import { configureTestBed } from '../../../../../testing/unit-test-helper'; -import { SharedModule } from '../../../../shared/shared.module'; +import { configureTestBed } from '~/testing/unit-test-helper'; +import { SharedModule } from '~/app/shared/shared.module'; import { OsdCreationPreviewModalComponent } from './osd-creation-preview-modal.component'; describe('OsdCreationPreviewModalComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-creation-preview-modal/osd-creation-preview-modal.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-creation-preview-modal/osd-creation-preview-modal.component.ts index 5a6a08fcc5f..979dcc3411f 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-creation-preview-modal/osd-creation-preview-modal.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-creation-preview-modal/osd-creation-preview-modal.component.ts @@ -3,12 +3,12 @@ import { Component, EventEmitter, Input, Output } from '@angular/core'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import _ from 'lodash'; -import { OsdService } from '../../../../shared/api/osd.service'; -import { ActionLabelsI18n, URLVerbs } from '../../../../shared/constants/app.constants'; -import { CdFormBuilder } from '../../../../shared/forms/cd-form-builder'; -import { CdFormGroup } from '../../../../shared/forms/cd-form-group'; -import { FinishedTask } from '../../../../shared/models/finished-task'; -import { TaskWrapperService } from '../../../../shared/services/task-wrapper.service'; +import { OsdService } from '~/app/shared/api/osd.service'; +import { ActionLabelsI18n, URLVerbs } from '~/app/shared/constants/app.constants'; +import { CdFormBuilder } from '~/app/shared/forms/cd-form-builder'; +import { CdFormGroup } from '~/app/shared/forms/cd-form-group'; +import { FinishedTask } from '~/app/shared/models/finished-task'; +import { TaskWrapperService } from '~/app/shared/services/task-wrapper.service'; @Component({ selector: 'cd-osd-creation-preview-modal', diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-details/osd-details.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-details/osd-details.component.spec.ts index 3272e2bc679..3ef846ff181 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-details/osd-details.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-details/osd-details.component.spec.ts @@ -3,11 +3,11 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { NgbNavModule } from '@ng-bootstrap/ng-bootstrap'; -import { configureTestBed } from '../../../../../testing/unit-test-helper'; -import { SharedModule } from '../../../../shared/shared.module'; -import { TablePerformanceCounterComponent } from '../../../performance-counter/table-performance-counter/table-performance-counter.component'; -import { DeviceListComponent } from '../../../shared/device-list/device-list.component'; -import { SmartListComponent } from '../../../shared/smart-list/smart-list.component'; +import { configureTestBed } from '~/testing/unit-test-helper'; +import { SharedModule } from '~/app/shared/shared.module'; +import { TablePerformanceCounterComponent } from '~/app/ceph/performance-counter/table-performance-counter/table-performance-counter.component'; +import { DeviceListComponent } from '~/app/ceph/shared/device-list/device-list.component'; +import { SmartListComponent } from '~/app/ceph/shared/smart-list/smart-list.component'; import { OsdDetailsComponent } from './osd-details.component'; describe('OsdDetailsComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-details/osd-details.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-details/osd-details.component.ts index 99a328908d0..5e52880f0ae 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-details/osd-details.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-details/osd-details.component.ts @@ -2,9 +2,9 @@ import { Component, Input, OnChanges } from '@angular/core'; import _ from 'lodash'; -import { OsdService } from '../../../../shared/api/osd.service'; -import { Permission } from '../../../../shared/models/permissions'; -import { AuthStorageService } from '../../../../shared/services/auth-storage.service'; +import { OsdService } from '~/app/shared/api/osd.service'; +import { Permission } from '~/app/shared/models/permissions'; +import { AuthStorageService } from '~/app/shared/services/auth-storage.service'; @Component({ selector: 'cd-osd-details', diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-devices-selection-groups/devices-selection-change-event.interface.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-devices-selection-groups/devices-selection-change-event.interface.ts index 7e9f8551a8a..0467f14f6b7 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-devices-selection-groups/devices-selection-change-event.interface.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-devices-selection-groups/devices-selection-change-event.interface.ts @@ -1,4 +1,4 @@ -import { CdTableColumnFiltersChange } from '../../../../shared/models/cd-table-column-filters-change'; +import { CdTableColumnFiltersChange } from '~/app/shared/models/cd-table-column-filters-change'; export interface DevicesSelectionChangeEvent extends CdTableColumnFiltersChange { type: string; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-devices-selection-groups/devices-selection-clear-event.interface.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-devices-selection-groups/devices-selection-clear-event.interface.ts index 58b7c828493..4e7a2ff5451 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-devices-selection-groups/devices-selection-clear-event.interface.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-devices-selection-groups/devices-selection-clear-event.interface.ts @@ -1,4 +1,4 @@ -import { InventoryDevice } from '../../inventory/inventory-devices/inventory-device.model'; +import { InventoryDevice } from '~/app/ceph/cluster/inventory/inventory-devices/inventory-device.model'; export interface DevicesSelectionClearEvent { type: string; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-devices-selection-groups/osd-devices-selection-groups.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-devices-selection-groups/osd-devices-selection-groups.component.spec.ts index 7aac4146f42..28765ca8ee4 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-devices-selection-groups/osd-devices-selection-groups.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-devices-selection-groups/osd-devices-selection-groups.component.spec.ts @@ -5,10 +5,10 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { ToastrModule } from 'ngx-toastr'; -import { configureTestBed, FixtureHelper, Mocks } from '../../../../../testing/unit-test-helper'; -import { SharedModule } from '../../../../shared/shared.module'; -import { InventoryDevice } from '../../inventory/inventory-devices/inventory-device.model'; -import { InventoryDevicesComponent } from '../../inventory/inventory-devices/inventory-devices.component'; +import { configureTestBed, FixtureHelper, Mocks } from '~/testing/unit-test-helper'; +import { SharedModule } from '~/app/shared/shared.module'; +import { InventoryDevice } from '~/app/ceph/cluster/inventory/inventory-devices/inventory-device.model'; +import { InventoryDevicesComponent } from '~/app/ceph/cluster/inventory/inventory-devices/inventory-devices.component'; import { OsdDevicesSelectionGroupsComponent } from './osd-devices-selection-groups.component'; describe('OsdDevicesSelectionGroupsComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-devices-selection-groups/osd-devices-selection-groups.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-devices-selection-groups/osd-devices-selection-groups.component.ts index cd23f8ce1e0..0b76a3b4358 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-devices-selection-groups/osd-devices-selection-groups.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-devices-selection-groups/osd-devices-selection-groups.component.ts @@ -2,10 +2,10 @@ import { Component, EventEmitter, Input, OnChanges, OnInit, Output } from '@angu import _ from 'lodash'; -import { Icons } from '../../../../shared/enum/icons.enum'; -import { CdTableColumnFiltersChange } from '../../../../shared/models/cd-table-column-filters-change'; -import { ModalService } from '../../../../shared/services/modal.service'; -import { InventoryDevice } from '../../inventory/inventory-devices/inventory-device.model'; +import { Icons } from '~/app/shared/enum/icons.enum'; +import { CdTableColumnFiltersChange } from '~/app/shared/models/cd-table-column-filters-change'; +import { ModalService } from '~/app/shared/services/modal.service'; +import { InventoryDevice } from '~/app/ceph/cluster/inventory/inventory-devices/inventory-device.model'; import { OsdDevicesSelectionModalComponent } from '../osd-devices-selection-modal/osd-devices-selection-modal.component'; import { DevicesSelectionChangeEvent } from './devices-selection-change-event.interface'; import { DevicesSelectionClearEvent } from './devices-selection-clear-event.interface'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-devices-selection-modal/osd-devices-selection-modal.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-devices-selection-modal/osd-devices-selection-modal.component.spec.ts index baa9e230e83..5edbfbd2f63 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-devices-selection-modal/osd-devices-selection-modal.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-devices-selection-modal/osd-devices-selection-modal.component.spec.ts @@ -7,11 +7,11 @@ import { RouterTestingModule } from '@angular/router/testing'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { ToastrModule } from 'ngx-toastr'; -import { configureTestBed, Mocks } from '../../../../../testing/unit-test-helper'; -import { CdTableColumnFiltersChange } from '../../../../shared/models/cd-table-column-filters-change'; -import { SharedModule } from '../../../../shared/shared.module'; -import { InventoryDevice } from '../../inventory/inventory-devices/inventory-device.model'; -import { InventoryDevicesComponent } from '../../inventory/inventory-devices/inventory-devices.component'; +import { configureTestBed, Mocks } from '~/testing/unit-test-helper'; +import { CdTableColumnFiltersChange } from '~/app/shared/models/cd-table-column-filters-change'; +import { SharedModule } from '~/app/shared/shared.module'; +import { InventoryDevice } from '~/app/ceph/cluster/inventory/inventory-devices/inventory-device.model'; +import { InventoryDevicesComponent } from '~/app/ceph/cluster/inventory/inventory-devices/inventory-devices.component'; import { OsdDevicesSelectionModalComponent } from './osd-devices-selection-modal.component'; describe('OsdDevicesSelectionModalComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-devices-selection-modal/osd-devices-selection-modal.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-devices-selection-modal/osd-devices-selection-modal.component.ts index 217f471a8e8..a143212a037 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-devices-selection-modal/osd-devices-selection-modal.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-devices-selection-modal/osd-devices-selection-modal.component.ts @@ -4,13 +4,13 @@ import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { TableColumnProp } from '@swimlane/ngx-datatable'; import _ from 'lodash'; -import { ActionLabelsI18n } from '../../../../shared/constants/app.constants'; -import { Icons } from '../../../../shared/enum/icons.enum'; -import { CdFormBuilder } from '../../../../shared/forms/cd-form-builder'; -import { CdFormGroup } from '../../../../shared/forms/cd-form-group'; -import { CdTableColumnFiltersChange } from '../../../../shared/models/cd-table-column-filters-change'; -import { InventoryDevice } from '../../inventory/inventory-devices/inventory-device.model'; -import { InventoryDevicesComponent } from '../../inventory/inventory-devices/inventory-devices.component'; +import { ActionLabelsI18n } from '~/app/shared/constants/app.constants'; +import { Icons } from '~/app/shared/enum/icons.enum'; +import { CdFormBuilder } from '~/app/shared/forms/cd-form-builder'; +import { CdFormGroup } from '~/app/shared/forms/cd-form-group'; +import { CdTableColumnFiltersChange } from '~/app/shared/models/cd-table-column-filters-change'; +import { InventoryDevice } from '~/app/ceph/cluster/inventory/inventory-devices/inventory-device.model'; +import { InventoryDevicesComponent } from '~/app/ceph/cluster/inventory/inventory-devices/inventory-devices.component'; @Component({ selector: 'cd-osd-devices-selection-modal', diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-flags-indiv-modal/osd-flags-indiv-modal.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-flags-indiv-modal/osd-flags-indiv-modal.component.spec.ts index c2be010f30c..0d14693bd96 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-flags-indiv-modal/osd-flags-indiv-modal.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-flags-indiv-modal/osd-flags-indiv-modal.component.spec.ts @@ -6,12 +6,12 @@ import { NgbActiveModal, NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap'; import { ToastrModule } from 'ngx-toastr'; import { of as observableOf } from 'rxjs'; -import { configureTestBed } from '../../../../../testing/unit-test-helper'; -import { OsdService } from '../../../../shared/api/osd.service'; -import { NotificationType } from '../../../../shared/enum/notification-type.enum'; -import { Flag } from '../../../../shared/models/flag'; -import { NotificationService } from '../../../../shared/services/notification.service'; -import { SharedModule } from '../../../../shared/shared.module'; +import { configureTestBed } from '~/testing/unit-test-helper'; +import { OsdService } from '~/app/shared/api/osd.service'; +import { NotificationType } from '~/app/shared/enum/notification-type.enum'; +import { Flag } from '~/app/shared/models/flag'; +import { NotificationService } from '~/app/shared/services/notification.service'; +import { SharedModule } from '~/app/shared/shared.module'; import { OsdFlagsIndivModalComponent } from './osd-flags-indiv-modal.component'; describe('OsdFlagsIndivModalComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-flags-indiv-modal/osd-flags-indiv-modal.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-flags-indiv-modal/osd-flags-indiv-modal.component.ts index 055ac72007e..652c9afa58b 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-flags-indiv-modal/osd-flags-indiv-modal.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-flags-indiv-modal/osd-flags-indiv-modal.component.ts @@ -4,12 +4,12 @@ import { FormGroup } from '@angular/forms'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import _ from 'lodash'; -import { OsdService } from '../../../../shared/api/osd.service'; -import { NotificationType } from '../../../../shared/enum/notification-type.enum'; -import { Flag } from '../../../../shared/models/flag'; -import { Permissions } from '../../../../shared/models/permissions'; -import { AuthStorageService } from '../../../../shared/services/auth-storage.service'; -import { NotificationService } from '../../../../shared/services/notification.service'; +import { OsdService } from '~/app/shared/api/osd.service'; +import { NotificationType } from '~/app/shared/enum/notification-type.enum'; +import { Flag } from '~/app/shared/models/flag'; +import { Permissions } from '~/app/shared/models/permissions'; +import { AuthStorageService } from '~/app/shared/services/auth-storage.service'; +import { NotificationService } from '~/app/shared/services/notification.service'; @Component({ selector: 'cd-osd-flags-indiv-modal', diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-flags-modal/osd-flags-modal.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-flags-modal/osd-flags-modal.component.spec.ts index e91c9534e96..1a500a82cfb 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-flags-modal/osd-flags-modal.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-flags-modal/osd-flags-modal.component.spec.ts @@ -7,10 +7,10 @@ import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import _ from 'lodash'; import { ToastrModule } from 'ngx-toastr'; -import { configureTestBed } from '../../../../../testing/unit-test-helper'; -import { NotificationType } from '../../../../shared/enum/notification-type.enum'; -import { NotificationService } from '../../../../shared/services/notification.service'; -import { SharedModule } from '../../../../shared/shared.module'; +import { configureTestBed } from '~/testing/unit-test-helper'; +import { NotificationType } from '~/app/shared/enum/notification-type.enum'; +import { NotificationService } from '~/app/shared/services/notification.service'; +import { SharedModule } from '~/app/shared/shared.module'; import { OsdFlagsModalComponent } from './osd-flags-modal.component'; function getFlagsArray(component: OsdFlagsModalComponent) { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-flags-modal/osd-flags-modal.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-flags-modal/osd-flags-modal.component.ts index 2245c69c600..05e61324e14 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-flags-modal/osd-flags-modal.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-flags-modal/osd-flags-modal.component.ts @@ -4,11 +4,11 @@ import { FormGroup } from '@angular/forms'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import _ from 'lodash'; -import { OsdService } from '../../../../shared/api/osd.service'; -import { NotificationType } from '../../../../shared/enum/notification-type.enum'; -import { Permissions } from '../../../../shared/models/permissions'; -import { AuthStorageService } from '../../../../shared/services/auth-storage.service'; -import { NotificationService } from '../../../../shared/services/notification.service'; +import { OsdService } from '~/app/shared/api/osd.service'; +import { NotificationType } from '~/app/shared/enum/notification-type.enum'; +import { Permissions } from '~/app/shared/models/permissions'; +import { AuthStorageService } from '~/app/shared/services/auth-storage.service'; +import { NotificationService } from '~/app/shared/services/notification.service'; @Component({ selector: 'cd-osd-flags-modal', diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-form/drive-group.model.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-form/drive-group.model.ts index 53e370dde22..841e947b894 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-form/drive-group.model.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-form/drive-group.model.ts @@ -1,7 +1,7 @@ import _ from 'lodash'; -import { CdTableColumnFiltersChange } from '../../../../shared/models/cd-table-column-filters-change'; -import { FormatterService } from '../../../../shared/services/formatter.service'; +import { CdTableColumnFiltersChange } from '~/app/shared/models/cd-table-column-filters-change'; +import { FormatterService } from '~/app/shared/services/formatter.service'; export class DriveGroup { spec: Object; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-form/osd-form.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-form/osd-form.component.spec.ts index 4ca688acc0d..e16262acea8 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-form/osd-form.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-form/osd-form.component.spec.ts @@ -11,13 +11,13 @@ import { configureTestBed, FixtureHelper, FormHelper -} from '../../../../../testing/unit-test-helper'; -import { OrchestratorService } from '../../../../shared/api/orchestrator.service'; -import { CdFormGroup } from '../../../../shared/forms/cd-form-group'; -import { SummaryService } from '../../../../shared/services/summary.service'; -import { SharedModule } from '../../../../shared/shared.module'; -import { InventoryDevice } from '../../inventory/inventory-devices/inventory-device.model'; -import { InventoryDevicesComponent } from '../../inventory/inventory-devices/inventory-devices.component'; +} from '~/testing/unit-test-helper'; +import { OrchestratorService } from '~/app/shared/api/orchestrator.service'; +import { CdFormGroup } from '~/app/shared/forms/cd-form-group'; +import { SummaryService } from '~/app/shared/services/summary.service'; +import { SharedModule } from '~/app/shared/shared.module'; +import { InventoryDevice } from '~/app/ceph/cluster/inventory/inventory-devices/inventory-device.model'; +import { InventoryDevicesComponent } from '~/app/ceph/cluster/inventory/inventory-devices/inventory-devices.component'; import { DevicesSelectionChangeEvent } from '../osd-devices-selection-groups/devices-selection-change-event.interface'; import { DevicesSelectionClearEvent } from '../osd-devices-selection-groups/devices-selection-clear-event.interface'; import { OsdDevicesSelectionGroupsComponent } from '../osd-devices-selection-groups/osd-devices-selection-groups.component'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-form/osd-form.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-form/osd-form.component.ts index 74d8b89f11f..fec8c72fe01 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-form/osd-form.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-form/osd-form.component.ts @@ -4,16 +4,16 @@ import { Router } from '@angular/router'; import _ from 'lodash'; -import { OrchestratorService } from '../../../../shared/api/orchestrator.service'; -import { SubmitButtonComponent } from '../../../../shared/components/submit-button/submit-button.component'; -import { ActionLabelsI18n } from '../../../../shared/constants/app.constants'; -import { Icons } from '../../../../shared/enum/icons.enum'; -import { CdForm } from '../../../../shared/forms/cd-form'; -import { CdFormGroup } from '../../../../shared/forms/cd-form-group'; -import { CdTableColumn } from '../../../../shared/models/cd-table-column'; -import { AuthStorageService } from '../../../../shared/services/auth-storage.service'; -import { ModalService } from '../../../../shared/services/modal.service'; -import { InventoryDevice } from '../../inventory/inventory-devices/inventory-device.model'; +import { OrchestratorService } from '~/app/shared/api/orchestrator.service'; +import { SubmitButtonComponent } from '~/app/shared/components/submit-button/submit-button.component'; +import { ActionLabelsI18n } from '~/app/shared/constants/app.constants'; +import { Icons } from '~/app/shared/enum/icons.enum'; +import { CdForm } from '~/app/shared/forms/cd-form'; +import { CdFormGroup } from '~/app/shared/forms/cd-form-group'; +import { CdTableColumn } from '~/app/shared/models/cd-table-column'; +import { AuthStorageService } from '~/app/shared/services/auth-storage.service'; +import { ModalService } from '~/app/shared/services/modal.service'; +import { InventoryDevice } from '~/app/ceph/cluster/inventory/inventory-devices/inventory-device.model'; import { OsdCreationPreviewModalComponent } from '../osd-creation-preview-modal/osd-creation-preview-modal.component'; import { DevicesSelectionChangeEvent } from '../osd-devices-selection-groups/devices-selection-change-event.interface'; import { DevicesSelectionClearEvent } from '../osd-devices-selection-groups/devices-selection-clear-event.interface'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-list/osd-list.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-list/osd-list.component.spec.ts index 0a1d77847f3..e48d0056589 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-list/osd-list.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-list/osd-list.component.spec.ts @@ -15,22 +15,22 @@ import { OrchestratorHelper, PermissionHelper, TableActionHelper -} from '../../../../../testing/unit-test-helper'; -import { CoreModule } from '../../../../core/core.module'; -import { OrchestratorService } from '../../../../shared/api/orchestrator.service'; -import { OsdService } from '../../../../shared/api/osd.service'; -import { ConfirmationModalComponent } from '../../../../shared/components/confirmation-modal/confirmation-modal.component'; -import { CriticalConfirmationModalComponent } from '../../../../shared/components/critical-confirmation-modal/critical-confirmation-modal.component'; -import { FormModalComponent } from '../../../../shared/components/form-modal/form-modal.component'; -import { TableActionsComponent } from '../../../../shared/datatable/table-actions/table-actions.component'; -import { CdTableAction } from '../../../../shared/models/cd-table-action'; -import { CdTableSelection } from '../../../../shared/models/cd-table-selection'; -import { OrchestratorFeature } from '../../../../shared/models/orchestrator.enum'; -import { Permissions } from '../../../../shared/models/permissions'; -import { AuthStorageService } from '../../../../shared/services/auth-storage.service'; -import { ModalService } from '../../../../shared/services/modal.service'; -import { CephModule } from '../../../ceph.module'; -import { PerformanceCounterModule } from '../../../performance-counter/performance-counter.module'; +} from '~/testing/unit-test-helper'; +import { CoreModule } from '~/app/core/core.module'; +import { OrchestratorService } from '~/app/shared/api/orchestrator.service'; +import { OsdService } from '~/app/shared/api/osd.service'; +import { ConfirmationModalComponent } from '~/app/shared/components/confirmation-modal/confirmation-modal.component'; +import { CriticalConfirmationModalComponent } from '~/app/shared/components/critical-confirmation-modal/critical-confirmation-modal.component'; +import { FormModalComponent } from '~/app/shared/components/form-modal/form-modal.component'; +import { TableActionsComponent } from '~/app/shared/datatable/table-actions/table-actions.component'; +import { CdTableAction } from '~/app/shared/models/cd-table-action'; +import { CdTableSelection } from '~/app/shared/models/cd-table-selection'; +import { OrchestratorFeature } from '~/app/shared/models/orchestrator.enum'; +import { Permissions } from '~/app/shared/models/permissions'; +import { AuthStorageService } from '~/app/shared/services/auth-storage.service'; +import { ModalService } from '~/app/shared/services/modal.service'; +import { CephModule } from '~/app/ceph/ceph.module'; +import { PerformanceCounterModule } from '~/app/ceph/performance-counter/performance-counter.module'; import { OsdReweightModalComponent } from '../osd-reweight-modal/osd-reweight-modal.component'; import { OsdListComponent } from './osd-list.component'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-list/osd-list.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-list/osd-list.component.ts index 1c7a7ad098c..5257b368bad 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-list/osd-list.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-list/osd-list.component.ts @@ -6,30 +6,30 @@ import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; import _ from 'lodash'; import { forkJoin as observableForkJoin, Observable } from 'rxjs'; -import { OrchestratorService } from '../../../../shared/api/orchestrator.service'; -import { OsdService } from '../../../../shared/api/osd.service'; -import { ListWithDetails } from '../../../../shared/classes/list-with-details.class'; -import { ConfirmationModalComponent } from '../../../../shared/components/confirmation-modal/confirmation-modal.component'; -import { CriticalConfirmationModalComponent } from '../../../../shared/components/critical-confirmation-modal/critical-confirmation-modal.component'; -import { FormModalComponent } from '../../../../shared/components/form-modal/form-modal.component'; -import { ActionLabelsI18n, URLVerbs } from '../../../../shared/constants/app.constants'; -import { CellTemplate } from '../../../../shared/enum/cell-template.enum'; -import { Icons } from '../../../../shared/enum/icons.enum'; -import { NotificationType } from '../../../../shared/enum/notification-type.enum'; -import { CdFormGroup } from '../../../../shared/forms/cd-form-group'; -import { CdTableAction } from '../../../../shared/models/cd-table-action'; -import { CdTableColumn } from '../../../../shared/models/cd-table-column'; -import { CdTableSelection } from '../../../../shared/models/cd-table-selection'; -import { FinishedTask } from '../../../../shared/models/finished-task'; -import { OrchestratorFeature } from '../../../../shared/models/orchestrator.enum'; -import { OrchestratorStatus } from '../../../../shared/models/orchestrator.interface'; -import { Permissions } from '../../../../shared/models/permissions'; -import { DimlessBinaryPipe } from '../../../../shared/pipes/dimless-binary.pipe'; -import { AuthStorageService } from '../../../../shared/services/auth-storage.service'; -import { ModalService } from '../../../../shared/services/modal.service'; -import { NotificationService } from '../../../../shared/services/notification.service'; -import { TaskWrapperService } from '../../../../shared/services/task-wrapper.service'; -import { URLBuilderService } from '../../../../shared/services/url-builder.service'; +import { OrchestratorService } from '~/app/shared/api/orchestrator.service'; +import { OsdService } from '~/app/shared/api/osd.service'; +import { ListWithDetails } from '~/app/shared/classes/list-with-details.class'; +import { ConfirmationModalComponent } from '~/app/shared/components/confirmation-modal/confirmation-modal.component'; +import { CriticalConfirmationModalComponent } from '~/app/shared/components/critical-confirmation-modal/critical-confirmation-modal.component'; +import { FormModalComponent } from '~/app/shared/components/form-modal/form-modal.component'; +import { ActionLabelsI18n, URLVerbs } from '~/app/shared/constants/app.constants'; +import { CellTemplate } from '~/app/shared/enum/cell-template.enum'; +import { Icons } from '~/app/shared/enum/icons.enum'; +import { NotificationType } from '~/app/shared/enum/notification-type.enum'; +import { CdFormGroup } from '~/app/shared/forms/cd-form-group'; +import { CdTableAction } from '~/app/shared/models/cd-table-action'; +import { CdTableColumn } from '~/app/shared/models/cd-table-column'; +import { CdTableSelection } from '~/app/shared/models/cd-table-selection'; +import { FinishedTask } from '~/app/shared/models/finished-task'; +import { OrchestratorFeature } from '~/app/shared/models/orchestrator.enum'; +import { OrchestratorStatus } from '~/app/shared/models/orchestrator.interface'; +import { Permissions } from '~/app/shared/models/permissions'; +import { DimlessBinaryPipe } from '~/app/shared/pipes/dimless-binary.pipe'; +import { AuthStorageService } from '~/app/shared/services/auth-storage.service'; +import { ModalService } from '~/app/shared/services/modal.service'; +import { NotificationService } from '~/app/shared/services/notification.service'; +import { TaskWrapperService } from '~/app/shared/services/task-wrapper.service'; +import { URLBuilderService } from '~/app/shared/services/url-builder.service'; import { OsdFlagsIndivModalComponent } from '../osd-flags-indiv-modal/osd-flags-indiv-modal.component'; import { OsdFlagsModalComponent } from '../osd-flags-modal/osd-flags-modal.component'; import { OsdPgScrubModalComponent } from '../osd-pg-scrub-modal/osd-pg-scrub-modal.component'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-pg-scrub-modal/osd-pg-scrub-modal.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-pg-scrub-modal/osd-pg-scrub-modal.component.spec.ts index 8b9d39268e2..b32a2f4d9ad 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-pg-scrub-modal/osd-pg-scrub-modal.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-pg-scrub-modal/osd-pg-scrub-modal.component.spec.ts @@ -8,11 +8,11 @@ import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { ToastrModule } from 'ngx-toastr'; import { of as observableOf } from 'rxjs'; -import { configureTestBed } from '../../../../../testing/unit-test-helper'; -import { ConfigurationService } from '../../../../shared/api/configuration.service'; -import { NotificationType } from '../../../../shared/enum/notification-type.enum'; -import { NotificationService } from '../../../../shared/services/notification.service'; -import { SharedModule } from '../../../../shared/shared.module'; +import { configureTestBed } from '~/testing/unit-test-helper'; +import { ConfigurationService } from '~/app/shared/api/configuration.service'; +import { NotificationType } from '~/app/shared/enum/notification-type.enum'; +import { NotificationService } from '~/app/shared/services/notification.service'; +import { SharedModule } from '~/app/shared/shared.module'; import { OsdPgScrubModalComponent } from './osd-pg-scrub-modal.component'; describe('OsdPgScrubModalComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-pg-scrub-modal/osd-pg-scrub-modal.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-pg-scrub-modal/osd-pg-scrub-modal.component.ts index 8c21b6d4177..7e76c99c5b8 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-pg-scrub-modal/osd-pg-scrub-modal.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-pg-scrub-modal/osd-pg-scrub-modal.component.ts @@ -3,13 +3,13 @@ import { Component, ViewChild } from '@angular/core'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { forkJoin as observableForkJoin } from 'rxjs'; -import { ConfigOptionComponent } from '../../../../shared/components/config-option/config-option.component'; -import { ActionLabelsI18n } from '../../../../shared/constants/app.constants'; -import { NotificationType } from '../../../../shared/enum/notification-type.enum'; -import { CdFormGroup } from '../../../../shared/forms/cd-form-group'; -import { Permissions } from '../../../../shared/models/permissions'; -import { AuthStorageService } from '../../../../shared/services/auth-storage.service'; -import { NotificationService } from '../../../../shared/services/notification.service'; +import { ConfigOptionComponent } from '~/app/shared/components/config-option/config-option.component'; +import { ActionLabelsI18n } from '~/app/shared/constants/app.constants'; +import { NotificationType } from '~/app/shared/enum/notification-type.enum'; +import { CdFormGroup } from '~/app/shared/forms/cd-form-group'; +import { Permissions } from '~/app/shared/models/permissions'; +import { AuthStorageService } from '~/app/shared/services/auth-storage.service'; +import { NotificationService } from '~/app/shared/services/notification.service'; import { OsdPgScrubModalOptions } from './osd-pg-scrub-modal.options'; @Component({ diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-recv-speed-modal/osd-recv-speed-modal.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-recv-speed-modal/osd-recv-speed-modal.component.spec.ts index 368c9692496..54b0a942b37 100755 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-recv-speed-modal/osd-recv-speed-modal.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-recv-speed-modal/osd-recv-speed-modal.component.spec.ts @@ -8,9 +8,9 @@ import _ from 'lodash'; import { ToastrModule } from 'ngx-toastr'; import { of as observableOf } from 'rxjs'; -import { configureTestBed } from '../../../../../testing/unit-test-helper'; -import { ConfigurationService } from '../../../../shared/api/configuration.service'; -import { SharedModule } from '../../../../shared/shared.module'; +import { configureTestBed } from '~/testing/unit-test-helper'; +import { ConfigurationService } from '~/app/shared/api/configuration.service'; +import { SharedModule } from '~/app/shared/shared.module'; import { OsdRecvSpeedModalComponent } from './osd-recv-speed-modal.component'; describe('OsdRecvSpeedModalComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-recv-speed-modal/osd-recv-speed-modal.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-recv-speed-modal/osd-recv-speed-modal.component.ts index b96f84ddcff..6c41d0180ab 100755 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-recv-speed-modal/osd-recv-speed-modal.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-recv-speed-modal/osd-recv-speed-modal.component.ts @@ -4,14 +4,14 @@ import { FormControl, Validators } from '@angular/forms'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import _ from 'lodash'; -import { ConfigurationService } from '../../../../shared/api/configuration.service'; -import { OsdService } from '../../../../shared/api/osd.service'; -import { ConfigOptionTypes } from '../../../../shared/components/config-option/config-option.types'; -import { NotificationType } from '../../../../shared/enum/notification-type.enum'; -import { CdFormGroup } from '../../../../shared/forms/cd-form-group'; -import { Permissions } from '../../../../shared/models/permissions'; -import { AuthStorageService } from '../../../../shared/services/auth-storage.service'; -import { NotificationService } from '../../../../shared/services/notification.service'; +import { ConfigurationService } from '~/app/shared/api/configuration.service'; +import { OsdService } from '~/app/shared/api/osd.service'; +import { ConfigOptionTypes } from '~/app/shared/components/config-option/config-option.types'; +import { NotificationType } from '~/app/shared/enum/notification-type.enum'; +import { CdFormGroup } from '~/app/shared/forms/cd-form-group'; +import { Permissions } from '~/app/shared/models/permissions'; +import { AuthStorageService } from '~/app/shared/services/auth-storage.service'; +import { NotificationService } from '~/app/shared/services/notification.service'; @Component({ selector: 'cd-osd-recv-speed-modal', diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-reweight-modal/osd-reweight-modal.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-reweight-modal/osd-reweight-modal.component.spec.ts index abd92bbe012..4d38df2108b 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-reweight-modal/osd-reweight-modal.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-reweight-modal/osd-reweight-modal.component.spec.ts @@ -6,12 +6,12 @@ import { RouterTestingModule } from '@angular/router/testing'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { of } from 'rxjs'; -import { configureTestBed } from '../../../../../testing/unit-test-helper'; -import { OsdService } from '../../../../shared/api/osd.service'; -import { BackButtonComponent } from '../../../../shared/components/back-button/back-button.component'; -import { ModalComponent } from '../../../../shared/components/modal/modal.component'; -import { SubmitButtonComponent } from '../../../../shared/components/submit-button/submit-button.component'; -import { CdFormBuilder } from '../../../../shared/forms/cd-form-builder'; +import { configureTestBed } from '~/testing/unit-test-helper'; +import { OsdService } from '~/app/shared/api/osd.service'; +import { BackButtonComponent } from '~/app/shared/components/back-button/back-button.component'; +import { ModalComponent } from '~/app/shared/components/modal/modal.component'; +import { SubmitButtonComponent } from '~/app/shared/components/submit-button/submit-button.component'; +import { CdFormBuilder } from '~/app/shared/forms/cd-form-builder'; import { OsdReweightModalComponent } from './osd-reweight-modal.component'; describe('OsdReweightModalComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-reweight-modal/osd-reweight-modal.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-reweight-modal/osd-reweight-modal.component.ts index fad56e284c5..392f3200394 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-reweight-modal/osd-reweight-modal.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-reweight-modal/osd-reweight-modal.component.ts @@ -3,9 +3,9 @@ import { Validators } from '@angular/forms'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; -import { OsdService } from '../../../../shared/api/osd.service'; -import { CdFormBuilder } from '../../../../shared/forms/cd-form-builder'; -import { CdFormGroup } from '../../../../shared/forms/cd-form-group'; +import { OsdService } from '~/app/shared/api/osd.service'; +import { CdFormBuilder } from '~/app/shared/forms/cd-form-builder'; +import { CdFormGroup } from '~/app/shared/forms/cd-form-group'; @Component({ selector: 'cd-osd-reweight-modal', diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-scrub-modal/osd-scrub-modal.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-scrub-modal/osd-scrub-modal.component.spec.ts index a2c2b1c8794..f572577711a 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-scrub-modal/osd-scrub-modal.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-scrub-modal/osd-scrub-modal.component.spec.ts @@ -4,10 +4,10 @@ import { ReactiveFormsModule } from '@angular/forms'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; -import { configureTestBed } from '../../../../../testing/unit-test-helper'; -import { OsdService } from '../../../../shared/api/osd.service'; -import { JoinPipe } from '../../../../shared/pipes/join.pipe'; -import { NotificationService } from '../../../../shared/services/notification.service'; +import { configureTestBed } from '~/testing/unit-test-helper'; +import { OsdService } from '~/app/shared/api/osd.service'; +import { JoinPipe } from '~/app/shared/pipes/join.pipe'; +import { NotificationService } from '~/app/shared/services/notification.service'; import { OsdScrubModalComponent } from './osd-scrub-modal.component'; describe('OsdScrubModalComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-scrub-modal/osd-scrub-modal.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-scrub-modal/osd-scrub-modal.component.ts index e7306bfa66a..9a1b58160c5 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-scrub-modal/osd-scrub-modal.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-scrub-modal/osd-scrub-modal.component.ts @@ -4,10 +4,10 @@ import { FormGroup } from '@angular/forms'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { forkJoin } from 'rxjs'; -import { OsdService } from '../../../../shared/api/osd.service'; -import { NotificationType } from '../../../../shared/enum/notification-type.enum'; -import { JoinPipe } from '../../../../shared/pipes/join.pipe'; -import { NotificationService } from '../../../../shared/services/notification.service'; +import { OsdService } from '~/app/shared/api/osd.service'; +import { NotificationType } from '~/app/shared/enum/notification-type.enum'; +import { JoinPipe } from '~/app/shared/pipes/join.pipe'; +import { NotificationService } from '~/app/shared/services/notification.service'; @Component({ selector: 'cd-osd-scrub-modal', diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/active-alert-list/active-alert-list.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/active-alert-list/active-alert-list.component.spec.ts index 558473d2204..4ce7eca8e15 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/active-alert-list/active-alert-list.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/active-alert-list/active-alert-list.component.spec.ts @@ -6,13 +6,13 @@ import { RouterTestingModule } from '@angular/router/testing'; import { NgbNavModule } from '@ng-bootstrap/ng-bootstrap'; import { ToastrModule } from 'ngx-toastr'; -import { configureTestBed, PermissionHelper } from '../../../../../testing/unit-test-helper'; -import { CoreModule } from '../../../../core/core.module'; -import { TableActionsComponent } from '../../../../shared/datatable/table-actions/table-actions.component'; -import { SharedModule } from '../../../../shared/shared.module'; -import { CephModule } from '../../../ceph.module'; -import { DashboardModule } from '../../../dashboard/dashboard.module'; -import { ClusterModule } from '../../cluster.module'; +import { configureTestBed, PermissionHelper } from '~/testing/unit-test-helper'; +import { CoreModule } from '~/app/core/core.module'; +import { TableActionsComponent } from '~/app/shared/datatable/table-actions/table-actions.component'; +import { SharedModule } from '~/app/shared/shared.module'; +import { CephModule } from '~/app/ceph/ceph.module'; +import { DashboardModule } from '~/app/ceph/dashboard/dashboard.module'; +import { ClusterModule } from '~/app/ceph/cluster/cluster.module'; import { ActiveAlertListComponent } from './active-alert-list.component'; describe('ActiveAlertListComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/active-alert-list/active-alert-list.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/active-alert-list/active-alert-list.component.ts index 7971de92d31..83888a5550c 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/active-alert-list/active-alert-list.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/active-alert-list/active-alert-list.component.ts @@ -1,16 +1,16 @@ import { Component, Inject, OnInit, TemplateRef, ViewChild } from '@angular/core'; -import { PrometheusService } from '../../../../shared/api/prometheus.service'; -import { CellTemplate } from '../../../../shared/enum/cell-template.enum'; -import { Icons } from '../../../../shared/enum/icons.enum'; -import { CdTableAction } from '../../../../shared/models/cd-table-action'; -import { CdTableColumn } from '../../../../shared/models/cd-table-column'; -import { CdTableSelection } from '../../../../shared/models/cd-table-selection'; -import { Permission } from '../../../../shared/models/permissions'; -import { CdDatePipe } from '../../../../shared/pipes/cd-date.pipe'; -import { AuthStorageService } from '../../../../shared/services/auth-storage.service'; -import { PrometheusAlertService } from '../../../../shared/services/prometheus-alert.service'; -import { URLBuilderService } from '../../../../shared/services/url-builder.service'; +import { PrometheusService } from '~/app/shared/api/prometheus.service'; +import { CellTemplate } from '~/app/shared/enum/cell-template.enum'; +import { Icons } from '~/app/shared/enum/icons.enum'; +import { CdTableAction } from '~/app/shared/models/cd-table-action'; +import { CdTableColumn } from '~/app/shared/models/cd-table-column'; +import { CdTableSelection } from '~/app/shared/models/cd-table-selection'; +import { Permission } from '~/app/shared/models/permissions'; +import { CdDatePipe } from '~/app/shared/pipes/cd-date.pipe'; +import { AuthStorageService } from '~/app/shared/services/auth-storage.service'; +import { PrometheusAlertService } from '~/app/shared/services/prometheus-alert.service'; +import { URLBuilderService } from '~/app/shared/services/url-builder.service'; import { PrometheusListHelper } from '../prometheus-list-helper'; const BASE_URL = 'silences'; // as only silence actions can be used diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/prometheus-list-helper.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/prometheus-list-helper.ts index 6bce8843ac2..c1a594908c5 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/prometheus-list-helper.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/prometheus-list-helper.ts @@ -1,7 +1,7 @@ import { Directive, OnInit } from '@angular/core'; -import { PrometheusService } from '../../../shared/api/prometheus.service'; -import { ListWithDetails } from '../../../shared/classes/list-with-details.class'; +import { PrometheusService } from '~/app/shared/api/prometheus.service'; +import { ListWithDetails } from '~/app/shared/classes/list-with-details.class'; @Directive() // tslint:disable-next-line: directive-class-suffix diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/prometheus-tabs/prometheus-tabs.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/prometheus-tabs/prometheus-tabs.component.spec.ts index 3176703994a..675063413ad 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/prometheus-tabs/prometheus-tabs.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/prometheus-tabs/prometheus-tabs.component.spec.ts @@ -3,7 +3,7 @@ import { RouterTestingModule } from '@angular/router/testing'; import { NgbNavModule } from '@ng-bootstrap/ng-bootstrap'; -import { configureTestBed } from '../../../../../testing/unit-test-helper'; +import { configureTestBed } from '~/testing/unit-test-helper'; import { PrometheusTabsComponent } from './prometheus-tabs.component'; describe('PrometheusTabsComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/rules-list/rules-list.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/rules-list/rules-list.component.spec.ts index 5f1b294f2dd..cac777914a1 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/rules-list/rules-list.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/rules-list/rules-list.component.spec.ts @@ -5,10 +5,10 @@ import { RouterTestingModule } from '@angular/router/testing'; import { NgbNavModule } from '@ng-bootstrap/ng-bootstrap'; import { ToastrModule } from 'ngx-toastr'; -import { configureTestBed } from '../../../../../testing/unit-test-helper'; -import { PrometheusService } from '../../../../shared/api/prometheus.service'; -import { SettingsService } from '../../../../shared/api/settings.service'; -import { SharedModule } from '../../../../shared/shared.module'; +import { configureTestBed } from '~/testing/unit-test-helper'; +import { PrometheusService } from '~/app/shared/api/prometheus.service'; +import { SettingsService } from '~/app/shared/api/settings.service'; +import { SharedModule } from '~/app/shared/shared.module'; import { PrometheusTabsComponent } from '../prometheus-tabs/prometheus-tabs.component'; import { RulesListComponent } from './rules-list.component'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/rules-list/rules-list.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/rules-list/rules-list.component.ts index 01830d00e77..325520d110e 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/rules-list/rules-list.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/rules-list/rules-list.component.ts @@ -1,10 +1,10 @@ import { Component, Inject, OnInit } from '@angular/core'; -import { PrometheusService } from '../../../../shared/api/prometheus.service'; -import { CdTableColumn } from '../../../../shared/models/cd-table-column'; -import { PrometheusRule } from '../../../../shared/models/prometheus-alerts'; -import { DurationPipe } from '../../../../shared/pipes/duration.pipe'; -import { PrometheusAlertService } from '../../../../shared/services/prometheus-alert.service'; +import { PrometheusService } from '~/app/shared/api/prometheus.service'; +import { CdTableColumn } from '~/app/shared/models/cd-table-column'; +import { PrometheusRule } from '~/app/shared/models/prometheus-alerts'; +import { DurationPipe } from '~/app/shared/pipes/duration.pipe'; +import { PrometheusAlertService } from '~/app/shared/services/prometheus-alert.service'; import { PrometheusListHelper } from '../prometheus-list-helper'; @Component({ diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/silence-form/silence-form.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/silence-form/silence-form.component.spec.ts index 69c0306f403..8bb0628bdfb 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/silence-form/silence-form.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/silence-form/silence-form.component.spec.ts @@ -15,17 +15,17 @@ import { FixtureHelper, FormHelper, PrometheusHelper -} from '../../../../../testing/unit-test-helper'; -import { NotFoundComponent } from '../../../../core/not-found/not-found.component'; -import { PrometheusService } from '../../../../shared/api/prometheus.service'; -import { NotificationType } from '../../../../shared/enum/notification-type.enum'; -import { CdFormGroup } from '../../../../shared/forms/cd-form-group'; -import { AlertmanagerSilence } from '../../../../shared/models/alertmanager-silence'; -import { Permission } from '../../../../shared/models/permissions'; -import { AuthStorageService } from '../../../../shared/services/auth-storage.service'; -import { ModalService } from '../../../../shared/services/modal.service'; -import { NotificationService } from '../../../../shared/services/notification.service'; -import { SharedModule } from '../../../../shared/shared.module'; +} from '~/testing/unit-test-helper'; +import { NotFoundComponent } from '~/app/core/not-found/not-found.component'; +import { PrometheusService } from '~/app/shared/api/prometheus.service'; +import { NotificationType } from '~/app/shared/enum/notification-type.enum'; +import { CdFormGroup } from '~/app/shared/forms/cd-form-group'; +import { AlertmanagerSilence } from '~/app/shared/models/alertmanager-silence'; +import { Permission } from '~/app/shared/models/permissions'; +import { AuthStorageService } from '~/app/shared/services/auth-storage.service'; +import { ModalService } from '~/app/shared/services/modal.service'; +import { NotificationService } from '~/app/shared/services/notification.service'; +import { SharedModule } from '~/app/shared/shared.module'; import { SilenceFormComponent } from './silence-form.component'; describe('SilenceFormComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/silence-form/silence-form.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/silence-form/silence-form.component.ts index 77a03102827..d97e5b98ddf 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/silence-form/silence-form.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/silence-form/silence-form.component.ts @@ -5,28 +5,28 @@ import { ActivatedRoute, Router } from '@angular/router'; import _ from 'lodash'; import moment from 'moment'; -import { PrometheusService } from '../../../../shared/api/prometheus.service'; +import { PrometheusService } from '~/app/shared/api/prometheus.service'; import { ActionLabelsI18n, SucceededActionLabelsI18n -} from '../../../../shared/constants/app.constants'; -import { Icons } from '../../../../shared/enum/icons.enum'; -import { NotificationType } from '../../../../shared/enum/notification-type.enum'; -import { CdFormBuilder } from '../../../../shared/forms/cd-form-builder'; -import { CdFormGroup } from '../../../../shared/forms/cd-form-group'; -import { CdValidators } from '../../../../shared/forms/cd-validators'; +} from '~/app/shared/constants/app.constants'; +import { Icons } from '~/app/shared/enum/icons.enum'; +import { NotificationType } from '~/app/shared/enum/notification-type.enum'; +import { CdFormBuilder } from '~/app/shared/forms/cd-form-builder'; +import { CdFormGroup } from '~/app/shared/forms/cd-form-group'; +import { CdValidators } from '~/app/shared/forms/cd-validators'; import { AlertmanagerSilence, AlertmanagerSilenceMatcher, AlertmanagerSilenceMatcherMatch -} from '../../../../shared/models/alertmanager-silence'; -import { Permission } from '../../../../shared/models/permissions'; -import { AlertmanagerAlert, PrometheusRule } from '../../../../shared/models/prometheus-alerts'; -import { AuthStorageService } from '../../../../shared/services/auth-storage.service'; -import { ModalService } from '../../../../shared/services/modal.service'; -import { NotificationService } from '../../../../shared/services/notification.service'; -import { PrometheusSilenceMatcherService } from '../../../../shared/services/prometheus-silence-matcher.service'; -import { TimeDiffService } from '../../../../shared/services/time-diff.service'; +} from '~/app/shared/models/alertmanager-silence'; +import { Permission } from '~/app/shared/models/permissions'; +import { AlertmanagerAlert, PrometheusRule } from '~/app/shared/models/prometheus-alerts'; +import { AuthStorageService } from '~/app/shared/services/auth-storage.service'; +import { ModalService } from '~/app/shared/services/modal.service'; +import { NotificationService } from '~/app/shared/services/notification.service'; +import { PrometheusSilenceMatcherService } from '~/app/shared/services/prometheus-silence-matcher.service'; +import { TimeDiffService } from '~/app/shared/services/time-diff.service'; import { SilenceMatcherModalComponent } from '../silence-matcher-modal/silence-matcher-modal.component'; @Component({ diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/silence-list/silence-list.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/silence-list/silence-list.component.spec.ts index a5e1a250bc6..359b5292e78 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/silence-list/silence-list.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/silence-list/silence-list.component.spec.ts @@ -7,14 +7,14 @@ import { NgbNavModule } from '@ng-bootstrap/ng-bootstrap'; import { ToastrModule } from 'ngx-toastr'; import { of } from 'rxjs'; -import { configureTestBed, PermissionHelper } from '../../../../../testing/unit-test-helper'; -import { PrometheusService } from '../../../../shared/api/prometheus.service'; -import { CriticalConfirmationModalComponent } from '../../../../shared/components/critical-confirmation-modal/critical-confirmation-modal.component'; -import { TableActionsComponent } from '../../../../shared/datatable/table-actions/table-actions.component'; -import { NotificationType } from '../../../../shared/enum/notification-type.enum'; -import { ModalService } from '../../../../shared/services/modal.service'; -import { NotificationService } from '../../../../shared/services/notification.service'; -import { SharedModule } from '../../../../shared/shared.module'; +import { configureTestBed, PermissionHelper } from '~/testing/unit-test-helper'; +import { PrometheusService } from '~/app/shared/api/prometheus.service'; +import { CriticalConfirmationModalComponent } from '~/app/shared/components/critical-confirmation-modal/critical-confirmation-modal.component'; +import { TableActionsComponent } from '~/app/shared/datatable/table-actions/table-actions.component'; +import { NotificationType } from '~/app/shared/enum/notification-type.enum'; +import { ModalService } from '~/app/shared/services/modal.service'; +import { NotificationService } from '~/app/shared/services/notification.service'; +import { SharedModule } from '~/app/shared/shared.module'; import { PrometheusTabsComponent } from '../prometheus-tabs/prometheus-tabs.component'; import { SilenceListComponent } from './silence-list.component'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/silence-list/silence-list.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/silence-list/silence-list.component.ts index e852352ac02..d1f2dde88bd 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/silence-list/silence-list.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/silence-list/silence-list.component.ts @@ -4,25 +4,25 @@ import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; import { SortDirection, SortPropDir } from '@swimlane/ngx-datatable'; import { Observable, Subscriber } from 'rxjs'; -import { PrometheusService } from '../../../../shared/api/prometheus.service'; -import { CriticalConfirmationModalComponent } from '../../../../shared/components/critical-confirmation-modal/critical-confirmation-modal.component'; +import { PrometheusService } from '~/app/shared/api/prometheus.service'; +import { CriticalConfirmationModalComponent } from '~/app/shared/components/critical-confirmation-modal/critical-confirmation-modal.component'; import { ActionLabelsI18n, SucceededActionLabelsI18n -} from '../../../../shared/constants/app.constants'; -import { CellTemplate } from '../../../../shared/enum/cell-template.enum'; -import { Icons } from '../../../../shared/enum/icons.enum'; -import { NotificationType } from '../../../../shared/enum/notification-type.enum'; -import { AlertmanagerSilence } from '../../../../shared/models/alertmanager-silence'; -import { CdTableAction } from '../../../../shared/models/cd-table-action'; -import { CdTableColumn } from '../../../../shared/models/cd-table-column'; -import { CdTableSelection } from '../../../../shared/models/cd-table-selection'; -import { Permission } from '../../../../shared/models/permissions'; -import { CdDatePipe } from '../../../../shared/pipes/cd-date.pipe'; -import { AuthStorageService } from '../../../../shared/services/auth-storage.service'; -import { ModalService } from '../../../../shared/services/modal.service'; -import { NotificationService } from '../../../../shared/services/notification.service'; -import { URLBuilderService } from '../../../../shared/services/url-builder.service'; +} from '~/app/shared/constants/app.constants'; +import { CellTemplate } from '~/app/shared/enum/cell-template.enum'; +import { Icons } from '~/app/shared/enum/icons.enum'; +import { NotificationType } from '~/app/shared/enum/notification-type.enum'; +import { AlertmanagerSilence } from '~/app/shared/models/alertmanager-silence'; +import { CdTableAction } from '~/app/shared/models/cd-table-action'; +import { CdTableColumn } from '~/app/shared/models/cd-table-column'; +import { CdTableSelection } from '~/app/shared/models/cd-table-selection'; +import { Permission } from '~/app/shared/models/permissions'; +import { CdDatePipe } from '~/app/shared/pipes/cd-date.pipe'; +import { AuthStorageService } from '~/app/shared/services/auth-storage.service'; +import { ModalService } from '~/app/shared/services/modal.service'; +import { NotificationService } from '~/app/shared/services/notification.service'; +import { URLBuilderService } from '~/app/shared/services/url-builder.service'; import { PrometheusListHelper } from '../prometheus-list-helper'; const BASE_URL = 'monitoring/silences'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/silence-matcher-modal/silence-matcher-modal.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/silence-matcher-modal/silence-matcher-modal.component.spec.ts index f20dd467693..d9017bba04e 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/silence-matcher-modal/silence-matcher-modal.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/silence-matcher-modal/silence-matcher-modal.component.spec.ts @@ -12,8 +12,8 @@ import { FixtureHelper, FormHelper, PrometheusHelper -} from '../../../../../testing/unit-test-helper'; -import { SharedModule } from '../../../../shared/shared.module'; +} from '~/testing/unit-test-helper'; +import { SharedModule } from '~/app/shared/shared.module'; import { SilenceMatcherModalComponent } from './silence-matcher-modal.component'; describe('SilenceMatcherModalComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/silence-matcher-modal/silence-matcher-modal.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/silence-matcher-modal/silence-matcher-modal.component.ts index 62eccd640e4..5c24a9bdf1c 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/silence-matcher-modal/silence-matcher-modal.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/silence-matcher-modal/silence-matcher-modal.component.ts @@ -6,14 +6,14 @@ import _ from 'lodash'; import { merge, Observable, Subject } from 'rxjs'; import { debounceTime, distinctUntilChanged, filter, map } from 'rxjs/operators'; -import { CdFormBuilder } from '../../../../shared/forms/cd-form-builder'; -import { CdFormGroup } from '../../../../shared/forms/cd-form-group'; +import { CdFormBuilder } from '~/app/shared/forms/cd-form-builder'; +import { CdFormGroup } from '~/app/shared/forms/cd-form-group'; import { AlertmanagerSilenceMatcher, AlertmanagerSilenceMatcherMatch -} from '../../../../shared/models/alertmanager-silence'; -import { PrometheusRule } from '../../../../shared/models/prometheus-alerts'; -import { PrometheusSilenceMatcherService } from '../../../../shared/services/prometheus-silence-matcher.service'; +} from '~/app/shared/models/alertmanager-silence'; +import { PrometheusRule } from '~/app/shared/models/prometheus-alerts'; +import { PrometheusSilenceMatcherService } from '~/app/shared/services/prometheus-silence-matcher.service'; @Component({ selector: 'cd-silence-matcher-modal', diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/service-daemon-list/service-daemon-list.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/service-daemon-list/service-daemon-list.component.spec.ts index f37b9477184..23dd46bf6cb 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/service-daemon-list/service-daemon-list.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/service-daemon-list/service-daemon-list.component.spec.ts @@ -4,13 +4,13 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import _ from 'lodash'; import { of } from 'rxjs'; -import { configureTestBed } from '../../../../../testing/unit-test-helper'; -import { CoreModule } from '../../../../core/core.module'; -import { CephServiceService } from '../../../../shared/api/ceph-service.service'; -import { HostService } from '../../../../shared/api/host.service'; -import { CdTableFetchDataContext } from '../../../../shared/models/cd-table-fetch-data-context'; -import { SharedModule } from '../../../../shared/shared.module'; -import { CephModule } from '../../../ceph.module'; +import { configureTestBed } from '~/testing/unit-test-helper'; +import { CoreModule } from '~/app/core/core.module'; +import { CephServiceService } from '~/app/shared/api/ceph-service.service'; +import { HostService } from '~/app/shared/api/host.service'; +import { CdTableFetchDataContext } from '~/app/shared/models/cd-table-fetch-data-context'; +import { SharedModule } from '~/app/shared/shared.module'; +import { CephModule } from '~/app/ceph/ceph.module'; import { ServiceDaemonListComponent } from './service-daemon-list.component'; describe('ServiceDaemonListComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/service-daemon-list/service-daemon-list.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/service-daemon-list/service-daemon-list.component.ts index f4589d2da12..5a7b223bc87 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/service-daemon-list/service-daemon-list.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/service-daemon-list/service-daemon-list.component.ts @@ -14,15 +14,15 @@ import { import _ from 'lodash'; import { Observable, Subscription } from 'rxjs'; -import { CephServiceService } from '../../../../shared/api/ceph-service.service'; -import { HostService } from '../../../../shared/api/host.service'; -import { OrchestratorService } from '../../../../shared/api/orchestrator.service'; -import { TableComponent } from '../../../../shared/datatable/table/table.component'; -import { CellTemplate } from '../../../../shared/enum/cell-template.enum'; -import { CdTableColumn } from '../../../../shared/models/cd-table-column'; -import { CdTableFetchDataContext } from '../../../../shared/models/cd-table-fetch-data-context'; -import { Daemon } from '../../../../shared/models/daemon.interface'; -import { RelativeDatePipe } from '../../../../shared/pipes/relative-date.pipe'; +import { CephServiceService } from '~/app/shared/api/ceph-service.service'; +import { HostService } from '~/app/shared/api/host.service'; +import { OrchestratorService } from '~/app/shared/api/orchestrator.service'; +import { TableComponent } from '~/app/shared/datatable/table/table.component'; +import { CellTemplate } from '~/app/shared/enum/cell-template.enum'; +import { CdTableColumn } from '~/app/shared/models/cd-table-column'; +import { CdTableFetchDataContext } from '~/app/shared/models/cd-table-fetch-data-context'; +import { Daemon } from '~/app/shared/models/daemon.interface'; +import { RelativeDatePipe } from '~/app/shared/pipes/relative-date.pipe'; @Component({ selector: 'cd-service-daemon-list', diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/service-details/service-details.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/service-details/service-details.component.spec.ts index ea65965a85c..5047d336d30 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/service-details/service-details.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/service-details/service-details.component.spec.ts @@ -4,10 +4,10 @@ import { RouterTestingModule } from '@angular/router/testing'; import { NgbNavModule } from '@ng-bootstrap/ng-bootstrap'; -import { configureTestBed } from '../../../../../testing/unit-test-helper'; -import { CdTableSelection } from '../../../../shared/models/cd-table-selection'; -import { SummaryService } from '../../../../shared/services/summary.service'; -import { SharedModule } from '../../../../shared/shared.module'; +import { configureTestBed } from '~/testing/unit-test-helper'; +import { CdTableSelection } from '~/app/shared/models/cd-table-selection'; +import { SummaryService } from '~/app/shared/services/summary.service'; +import { SharedModule } from '~/app/shared/shared.module'; import { ServiceDaemonListComponent } from '../service-daemon-list/service-daemon-list.component'; import { ServiceDetailsComponent } from './service-details.component'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/service-details/service-details.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/service-details/service-details.component.ts index 09eb4d2f599..0aed38e672a 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/service-details/service-details.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/service-details/service-details.component.ts @@ -1,7 +1,7 @@ import { Component, Input } from '@angular/core'; -import { CdTableSelection } from '../../../../shared/models/cd-table-selection'; -import { Permissions } from '../../../../shared/models/permissions'; +import { CdTableSelection } from '~/app/shared/models/cd-table-selection'; +import { Permissions } from '~/app/shared/models/permissions'; @Component({ selector: 'cd-service-details', diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/service-form/service-form.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/service-form/service-form.component.spec.ts index b224aaa22f7..335f7bd9adb 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/service-form/service-form.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/service-form/service-form.component.spec.ts @@ -7,10 +7,10 @@ import { NgbTypeaheadModule } from '@ng-bootstrap/ng-bootstrap'; import _ from 'lodash'; import { ToastrModule } from 'ngx-toastr'; -import { configureTestBed, FormHelper } from '../../../../../testing/unit-test-helper'; -import { CephServiceService } from '../../../../shared/api/ceph-service.service'; -import { CdFormGroup } from '../../../../shared/forms/cd-form-group'; -import { SharedModule } from '../../../../shared/shared.module'; +import { configureTestBed, FormHelper } from '~/testing/unit-test-helper'; +import { CephServiceService } from '~/app/shared/api/ceph-service.service'; +import { CdFormGroup } from '~/app/shared/forms/cd-form-group'; +import { SharedModule } from '~/app/shared/shared.module'; import { ServiceFormComponent } from './service-form.component'; describe('ServiceFormComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/service-form/service-form.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/service-form/service-form.component.ts index 05756414a10..9a2b7747b11 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/service-form/service-form.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/service-form/service-form.component.ts @@ -7,18 +7,18 @@ import _ from 'lodash'; import { merge, Observable, Subject } from 'rxjs'; import { debounceTime, distinctUntilChanged, filter, map } from 'rxjs/operators'; -import { CephServiceService } from '../../../../shared/api/ceph-service.service'; -import { HostService } from '../../../../shared/api/host.service'; -import { PoolService } from '../../../../shared/api/pool.service'; -import { SelectMessages } from '../../../../shared/components/select/select-messages.model'; -import { SelectOption } from '../../../../shared/components/select/select-option.model'; -import { ActionLabelsI18n, URLVerbs } from '../../../../shared/constants/app.constants'; -import { CdForm } from '../../../../shared/forms/cd-form'; -import { CdFormBuilder } from '../../../../shared/forms/cd-form-builder'; -import { CdFormGroup } from '../../../../shared/forms/cd-form-group'; -import { CdValidators } from '../../../../shared/forms/cd-validators'; -import { FinishedTask } from '../../../../shared/models/finished-task'; -import { TaskWrapperService } from '../../../../shared/services/task-wrapper.service'; +import { CephServiceService } from '~/app/shared/api/ceph-service.service'; +import { HostService } from '~/app/shared/api/host.service'; +import { PoolService } from '~/app/shared/api/pool.service'; +import { SelectMessages } from '~/app/shared/components/select/select-messages.model'; +import { SelectOption } from '~/app/shared/components/select/select-option.model'; +import { ActionLabelsI18n, URLVerbs } from '~/app/shared/constants/app.constants'; +import { CdForm } from '~/app/shared/forms/cd-form'; +import { CdFormBuilder } from '~/app/shared/forms/cd-form-builder'; +import { CdFormGroup } from '~/app/shared/forms/cd-form-group'; +import { CdValidators } from '~/app/shared/forms/cd-validators'; +import { FinishedTask } from '~/app/shared/models/finished-task'; +import { TaskWrapperService } from '~/app/shared/services/task-wrapper.service'; @Component({ selector: 'cd-service-form', diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/services.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/services.component.spec.ts index 8fa09bb0616..990729e9026 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/services.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/services.component.spec.ts @@ -6,15 +6,15 @@ import { RouterTestingModule } from '@angular/router/testing'; import { ToastrModule } from 'ngx-toastr'; import { of } from 'rxjs'; -import { configureTestBed } from '../../../../testing/unit-test-helper'; -import { CoreModule } from '../../../core/core.module'; -import { CephServiceService } from '../../../shared/api/ceph-service.service'; -import { OrchestratorService } from '../../../shared/api/orchestrator.service'; -import { CdTableFetchDataContext } from '../../../shared/models/cd-table-fetch-data-context'; -import { Permissions } from '../../../shared/models/permissions'; -import { AuthStorageService } from '../../../shared/services/auth-storage.service'; -import { SharedModule } from '../../../shared/shared.module'; -import { CephModule } from '../../ceph.module'; +import { configureTestBed } from '~/testing/unit-test-helper'; +import { CoreModule } from '~/app/core/core.module'; +import { CephServiceService } from '~/app/shared/api/ceph-service.service'; +import { OrchestratorService } from '~/app/shared/api/orchestrator.service'; +import { CdTableFetchDataContext } from '~/app/shared/models/cd-table-fetch-data-context'; +import { Permissions } from '~/app/shared/models/permissions'; +import { AuthStorageService } from '~/app/shared/services/auth-storage.service'; +import { SharedModule } from '~/app/shared/shared.module'; +import { CephModule } from '~/app/ceph/ceph.module'; import { ServicesComponent } from './services.component'; describe('ServicesComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/services.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/services.component.ts index 5f065704c99..8306f7ddf0f 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/services.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/services.component.ts @@ -2,28 +2,28 @@ import { Component, Input, OnChanges, OnInit, ViewChild } from '@angular/core'; import { delay, finalize } from 'rxjs/operators'; -import { CephServiceService } from '../../../shared/api/ceph-service.service'; -import { OrchestratorService } from '../../../shared/api/orchestrator.service'; -import { ListWithDetails } from '../../../shared/classes/list-with-details.class'; -import { CriticalConfirmationModalComponent } from '../../../shared/components/critical-confirmation-modal/critical-confirmation-modal.component'; -import { ActionLabelsI18n, URLVerbs } from '../../../shared/constants/app.constants'; -import { TableComponent } from '../../../shared/datatable/table/table.component'; -import { CellTemplate } from '../../../shared/enum/cell-template.enum'; -import { Icons } from '../../../shared/enum/icons.enum'; -import { CdTableAction } from '../../../shared/models/cd-table-action'; -import { CdTableColumn } from '../../../shared/models/cd-table-column'; -import { CdTableFetchDataContext } from '../../../shared/models/cd-table-fetch-data-context'; -import { CdTableSelection } from '../../../shared/models/cd-table-selection'; -import { FinishedTask } from '../../../shared/models/finished-task'; -import { OrchestratorFeature } from '../../../shared/models/orchestrator.enum'; -import { OrchestratorStatus } from '../../../shared/models/orchestrator.interface'; -import { Permissions } from '../../../shared/models/permissions'; -import { CephServiceSpec } from '../../../shared/models/service.interface'; -import { RelativeDatePipe } from '../../../shared/pipes/relative-date.pipe'; -import { AuthStorageService } from '../../../shared/services/auth-storage.service'; -import { ModalService } from '../../../shared/services/modal.service'; -import { TaskWrapperService } from '../../../shared/services/task-wrapper.service'; -import { URLBuilderService } from '../../../shared/services/url-builder.service'; +import { CephServiceService } from '~/app/shared/api/ceph-service.service'; +import { OrchestratorService } from '~/app/shared/api/orchestrator.service'; +import { ListWithDetails } from '~/app/shared/classes/list-with-details.class'; +import { CriticalConfirmationModalComponent } from '~/app/shared/components/critical-confirmation-modal/critical-confirmation-modal.component'; +import { ActionLabelsI18n, URLVerbs } from '~/app/shared/constants/app.constants'; +import { TableComponent } from '~/app/shared/datatable/table/table.component'; +import { CellTemplate } from '~/app/shared/enum/cell-template.enum'; +import { Icons } from '~/app/shared/enum/icons.enum'; +import { CdTableAction } from '~/app/shared/models/cd-table-action'; +import { CdTableColumn } from '~/app/shared/models/cd-table-column'; +import { CdTableFetchDataContext } from '~/app/shared/models/cd-table-fetch-data-context'; +import { CdTableSelection } from '~/app/shared/models/cd-table-selection'; +import { FinishedTask } from '~/app/shared/models/finished-task'; +import { OrchestratorFeature } from '~/app/shared/models/orchestrator.enum'; +import { OrchestratorStatus } from '~/app/shared/models/orchestrator.interface'; +import { Permissions } from '~/app/shared/models/permissions'; +import { CephServiceSpec } from '~/app/shared/models/service.interface'; +import { RelativeDatePipe } from '~/app/shared/pipes/relative-date.pipe'; +import { AuthStorageService } from '~/app/shared/services/auth-storage.service'; +import { ModalService } from '~/app/shared/services/modal.service'; +import { TaskWrapperService } from '~/app/shared/services/task-wrapper.service'; +import { URLBuilderService } from '~/app/shared/services/url-builder.service'; const BASE_URL = 'services'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/telemetry/telemetry.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/telemetry/telemetry.component.spec.ts index 901f1774307..6fed655a8a4 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/telemetry/telemetry.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/telemetry/telemetry.component.spec.ts @@ -4,15 +4,15 @@ import { ReactiveFormsModule } from '@angular/forms'; import { Router } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; -import { DownloadButtonComponent } from 'app/shared/components/download-button/download-button.component'; +import { DownloadButtonComponent } from '~/app/shared/components/download-button/download-button.component'; import _ from 'lodash'; import { ToastrModule } from 'ngx-toastr'; import { of as observableOf } from 'rxjs'; -import { configureTestBed } from '../../../../testing/unit-test-helper'; -import { MgrModuleService } from '../../../shared/api/mgr-module.service'; -import { LoadingPanelComponent } from '../../../shared/components/loading-panel/loading-panel.component'; -import { SharedModule } from '../../../shared/shared.module'; +import { configureTestBed } from '~/testing/unit-test-helper'; +import { MgrModuleService } from '~/app/shared/api/mgr-module.service'; +import { LoadingPanelComponent } from '~/app/shared/components/loading-panel/loading-panel.component'; +import { SharedModule } from '~/app/shared/shared.module'; import { TelemetryComponent } from './telemetry.component'; describe('TelemetryComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/telemetry/telemetry.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/telemetry/telemetry.component.ts index ccb695d864a..4b65089c655 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/telemetry/telemetry.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/telemetry/telemetry.component.ts @@ -5,15 +5,15 @@ import { Router } from '@angular/router'; import _ from 'lodash'; import { forkJoin as observableForkJoin } from 'rxjs'; -import { MgrModuleService } from '../../../shared/api/mgr-module.service'; -import { TelemetryService } from '../../../shared/api/telemetry.service'; -import { NotificationType } from '../../../shared/enum/notification-type.enum'; -import { CdForm } from '../../../shared/forms/cd-form'; -import { CdFormBuilder } from '../../../shared/forms/cd-form-builder'; -import { CdFormGroup } from '../../../shared/forms/cd-form-group'; -import { CdValidators } from '../../../shared/forms/cd-validators'; -import { NotificationService } from '../../../shared/services/notification.service'; -import { TelemetryNotificationService } from '../../../shared/services/telemetry-notification.service'; +import { MgrModuleService } from '~/app/shared/api/mgr-module.service'; +import { TelemetryService } from '~/app/shared/api/telemetry.service'; +import { NotificationType } from '~/app/shared/enum/notification-type.enum'; +import { CdForm } from '~/app/shared/forms/cd-form'; +import { CdFormBuilder } from '~/app/shared/forms/cd-form-builder'; +import { CdFormGroup } from '~/app/shared/forms/cd-form-group'; +import { CdValidators } from '~/app/shared/forms/cd-validators'; +import { NotificationService } from '~/app/shared/services/notification.service'; +import { TelemetryNotificationService } from '~/app/shared/services/telemetry-notification.service'; @Component({ selector: 'cd-telemetry', diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/dashboard.module.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/dashboard.module.ts index 7b746b10d4f..1205de94dd6 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/dashboard.module.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/dashboard.module.ts @@ -5,7 +5,7 @@ import { RouterModule } from '@angular/router'; import { NgbNavModule, NgbPopoverModule } from '@ng-bootstrap/ng-bootstrap'; import { ChartsModule } from 'ng2-charts'; -import { SharedModule } from '../../shared/shared.module'; +import { SharedModule } from '~/app/shared/shared.module'; import { CephSharedModule } from '../shared/ceph-shared.module'; import { DashboardComponent } from './dashboard/dashboard.component'; import { HealthPieComponent } from './health-pie/health-pie.component'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/dashboard/dashboard.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/dashboard/dashboard.component.spec.ts index 468719ea957..7bc4980bb82 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/dashboard/dashboard.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/dashboard/dashboard.component.spec.ts @@ -3,7 +3,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { NgbNavModule } from '@ng-bootstrap/ng-bootstrap'; -import { configureTestBed } from '../../../../testing/unit-test-helper'; +import { configureTestBed } from '~/testing/unit-test-helper'; import { DashboardComponent } from './dashboard.component'; describe('DashboardComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/health-pie/health-pie.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/health-pie/health-pie.component.spec.ts index 25782502ca5..5fc01f36ee8 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/health-pie/health-pie.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/health-pie/health-pie.component.spec.ts @@ -1,10 +1,10 @@ import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { configureTestBed } from '../../../../testing/unit-test-helper'; -import { DimlessBinaryPipe } from '../../../shared/pipes/dimless-binary.pipe'; -import { DimlessPipe } from '../../../shared/pipes/dimless.pipe'; -import { FormatterService } from '../../../shared/services/formatter.service'; +import { configureTestBed } from '~/testing/unit-test-helper'; +import { DimlessBinaryPipe } from '~/app/shared/pipes/dimless-binary.pipe'; +import { DimlessPipe } from '~/app/shared/pipes/dimless.pipe'; +import { FormatterService } from '~/app/shared/services/formatter.service'; import { HealthPieComponent } from './health-pie.component'; describe('HealthPieComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/health-pie/health-pie.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/health-pie/health-pie.component.ts index 67ef99df1b9..19c42ae4686 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/health-pie/health-pie.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/health-pie/health-pie.component.ts @@ -13,10 +13,10 @@ import * as Chart from 'chart.js'; import _ from 'lodash'; import { PluginServiceGlobalRegistrationAndOptions } from 'ng2-charts'; -import styles from '../../../../styles.scss'; -import { ChartTooltip } from '../../../shared/models/chart-tooltip'; -import { DimlessBinaryPipe } from '../../../shared/pipes/dimless-binary.pipe'; -import { DimlessPipe } from '../../../shared/pipes/dimless.pipe'; +import styles from '~/styles.scss'; +import { ChartTooltip } from '~/app/shared/models/chart-tooltip'; +import { DimlessBinaryPipe } from '~/app/shared/pipes/dimless-binary.pipe'; +import { DimlessPipe } from '~/app/shared/pipes/dimless.pipe'; @Component({ selector: 'cd-health-pie', diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/health/health.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/health/health.component.spec.ts index bc54ff4a162..69628e69f0b 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/health/health.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/health/health.component.spec.ts @@ -6,14 +6,14 @@ import { By } from '@angular/platform-browser'; import _ from 'lodash'; import { of } from 'rxjs'; -import { configureTestBed } from '../../../../testing/unit-test-helper'; -import { HealthService } from '../../../shared/api/health.service'; -import { Permissions } from '../../../shared/models/permissions'; -import { AuthStorageService } from '../../../shared/services/auth-storage.service'; -import { FeatureTogglesService } from '../../../shared/services/feature-toggles.service'; -import { RefreshIntervalService } from '../../../shared/services/refresh-interval.service'; -import { SharedModule } from '../../../shared/shared.module'; -import { PgCategoryService } from '../../shared/pg-category.service'; +import { configureTestBed } from '~/testing/unit-test-helper'; +import { HealthService } from '~/app/shared/api/health.service'; +import { Permissions } from '~/app/shared/models/permissions'; +import { AuthStorageService } from '~/app/shared/services/auth-storage.service'; +import { FeatureTogglesService } from '~/app/shared/services/feature-toggles.service'; +import { RefreshIntervalService } from '~/app/shared/services/refresh-interval.service'; +import { SharedModule } from '~/app/shared/shared.module'; +import { PgCategoryService } from '~/app/ceph/shared/pg-category.service'; import { HealthPieComponent } from '../health-pie/health-pie.component'; import { MdsSummaryPipe } from '../mds-summary.pipe'; import { MgrSummaryPipe } from '../mgr-summary.pipe'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/health/health.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/health/health.component.ts index 717a113c8ad..dc67b3e4b19 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/health/health.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/health/health.component.ts @@ -3,19 +3,19 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; import _ from 'lodash'; import { Subscription } from 'rxjs'; -import styles from '../../../../styles.scss'; -import { HealthService } from '../../../shared/api/health.service'; -import { Icons } from '../../../shared/enum/icons.enum'; -import { Permissions } from '../../../shared/models/permissions'; -import { DimlessBinaryPipe } from '../../../shared/pipes/dimless-binary.pipe'; -import { DimlessPipe } from '../../../shared/pipes/dimless.pipe'; -import { AuthStorageService } from '../../../shared/services/auth-storage.service'; +import styles from '~/styles.scss'; +import { HealthService } from '~/app/shared/api/health.service'; +import { Icons } from '~/app/shared/enum/icons.enum'; +import { Permissions } from '~/app/shared/models/permissions'; +import { DimlessBinaryPipe } from '~/app/shared/pipes/dimless-binary.pipe'; +import { DimlessPipe } from '~/app/shared/pipes/dimless.pipe'; +import { AuthStorageService } from '~/app/shared/services/auth-storage.service'; import { FeatureTogglesMap$, FeatureTogglesService -} from '../../../shared/services/feature-toggles.service'; -import { RefreshIntervalService } from '../../../shared/services/refresh-interval.service'; -import { PgCategoryService } from '../../shared/pg-category.service'; +} from '~/app/shared/services/feature-toggles.service'; +import { RefreshIntervalService } from '~/app/shared/services/refresh-interval.service'; +import { PgCategoryService } from '~/app/ceph/shared/pg-category.service'; @Component({ selector: 'cd-health', diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/info-card/info-card.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/info-card/info-card.component.spec.ts index a4be2aeb9e9..bde9a9a00b2 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/info-card/info-card.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/info-card/info-card.component.spec.ts @@ -1,7 +1,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; -import { configureTestBed } from '../../../../testing/unit-test-helper'; +import { configureTestBed } from '~/testing/unit-test-helper'; import { InfoCardComponent } from './info-card.component'; describe('InfoCardComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/info-group/info-group.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/info-group/info-group.component.spec.ts index 8b418a8d276..3ee27498586 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/info-group/info-group.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/info-group/info-group.component.spec.ts @@ -2,8 +2,8 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { NgbPopoverModule } from '@ng-bootstrap/ng-bootstrap'; -import { configureTestBed } from '../../../../testing/unit-test-helper'; -import { SharedModule } from '../../../shared/shared.module'; +import { configureTestBed } from '~/testing/unit-test-helper'; +import { SharedModule } from '~/app/shared/shared.module'; import { InfoGroupComponent } from './info-group.component'; describe('InfoGroupComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/info-group/info-group.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/info-group/info-group.component.ts index e172a920f67..167db9e2fa9 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/info-group/info-group.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/info-group/info-group.component.ts @@ -1,6 +1,6 @@ import { Component, Input } from '@angular/core'; -import { Icons } from '../../../shared/enum/icons.enum'; +import { Icons } from '~/app/shared/enum/icons.enum'; @Component({ selector: 'cd-info-group', diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/mds-summary.pipe.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/mds-summary.pipe.spec.ts index 68d951bd01c..c62b35c548e 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/mds-summary.pipe.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/mds-summary.pipe.spec.ts @@ -1,6 +1,6 @@ import { TestBed } from '@angular/core/testing'; -import { configureTestBed } from '../../../testing/unit-test-helper'; +import { configureTestBed } from '~/testing/unit-test-helper'; import { MdsSummaryPipe } from './mds-summary.pipe'; describe('MdsSummaryPipe', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/mgr-summary.pipe.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/mgr-summary.pipe.spec.ts index a81530c54d8..8bc2753808e 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/mgr-summary.pipe.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/mgr-summary.pipe.spec.ts @@ -1,6 +1,6 @@ import { TestBed } from '@angular/core/testing'; -import { configureTestBed } from '../../../testing/unit-test-helper'; +import { configureTestBed } from '~/testing/unit-test-helper'; import { MgrSummaryPipe } from './mgr-summary.pipe'; describe('MgrSummaryPipe', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/mon-summary.pipe.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/mon-summary.pipe.spec.ts index 15374674190..b8a083a325c 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/mon-summary.pipe.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/mon-summary.pipe.spec.ts @@ -1,6 +1,6 @@ import { TestBed } from '@angular/core/testing'; -import { configureTestBed } from '../../../testing/unit-test-helper'; +import { configureTestBed } from '~/testing/unit-test-helper'; import { MonSummaryPipe } from './mon-summary.pipe'; describe('MonSummaryPipe', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/osd-summary.pipe.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/osd-summary.pipe.spec.ts index 13456e26343..d5cdb598dcf 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/osd-summary.pipe.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/osd-summary.pipe.spec.ts @@ -1,6 +1,6 @@ import { TestBed } from '@angular/core/testing'; -import { configureTestBed } from '../../../testing/unit-test-helper'; +import { configureTestBed } from '~/testing/unit-test-helper'; import { OsdSummaryPipe } from './osd-summary.pipe'; describe('OsdSummaryPipe', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/nfs/nfs-501/nfs-501.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/nfs/nfs-501/nfs-501.component.spec.ts index cec861ba47f..704927973df 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/nfs/nfs-501/nfs-501.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/nfs/nfs-501/nfs-501.component.spec.ts @@ -2,8 +2,8 @@ import { HttpClientTestingModule } from '@angular/common/http/testing'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; -import { configureTestBed } from '../../../../testing/unit-test-helper'; -import { SharedModule } from '../../../shared/shared.module'; +import { configureTestBed } from '~/testing/unit-test-helper'; +import { SharedModule } from '~/app/shared/shared.module'; import { Nfs501Component } from './nfs-501.component'; describe('Nfs501Component', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/nfs/nfs-details/nfs-details.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/nfs/nfs-details/nfs-details.component.spec.ts index 2c2e5e189af..6d9d39f2796 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/nfs/nfs-details/nfs-details.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/nfs/nfs-details/nfs-details.component.spec.ts @@ -6,8 +6,8 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { NgbNavModule } from '@ng-bootstrap/ng-bootstrap'; import _ from 'lodash'; -import { configureTestBed } from '../../../../testing/unit-test-helper'; -import { SharedModule } from '../../../shared/shared.module'; +import { configureTestBed } from '~/testing/unit-test-helper'; +import { SharedModule } from '~/app/shared/shared.module'; import { NfsDetailsComponent } from './nfs-details.component'; describe('NfsDetailsComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/nfs/nfs-details/nfs-details.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/nfs/nfs-details/nfs-details.component.ts index a7760400f09..25a42416f7e 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/nfs/nfs-details/nfs-details.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/nfs/nfs-details/nfs-details.component.ts @@ -1,6 +1,6 @@ import { Component, Input, OnChanges } from '@angular/core'; -import { CdTableColumn } from '../../../shared/models/cd-table-column'; +import { CdTableColumn } from '~/app/shared/models/cd-table-column'; @Component({ selector: 'cd-nfs-details', diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/nfs/nfs-form-client/nfs-form-client.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/nfs/nfs-form-client/nfs-form-client.component.spec.ts index e85e655626a..ada6da551df 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/nfs/nfs-form-client/nfs-form-client.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/nfs/nfs-form-client/nfs-form-client.component.spec.ts @@ -2,10 +2,10 @@ import { HttpClientTestingModule } from '@angular/common/http/testing'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { FormControl, ReactiveFormsModule } from '@angular/forms'; -import { configureTestBed } from '../../../../testing/unit-test-helper'; -import { CdFormBuilder } from '../../../shared/forms/cd-form-builder'; -import { CdFormGroup } from '../../../shared/forms/cd-form-group'; -import { SharedModule } from '../../../shared/shared.module'; +import { configureTestBed } from '~/testing/unit-test-helper'; +import { CdFormBuilder } from '~/app/shared/forms/cd-form-builder'; +import { CdFormGroup } from '~/app/shared/forms/cd-form-group'; +import { SharedModule } from '~/app/shared/shared.module'; import { NfsFormClientComponent } from './nfs-form-client.component'; describe('NfsFormClientComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/nfs/nfs-form-client/nfs-form-client.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/nfs/nfs-form-client/nfs-form-client.component.ts index a35b514eec3..8423f177567 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/nfs/nfs-form-client/nfs-form-client.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/nfs/nfs-form-client/nfs-form-client.component.ts @@ -3,9 +3,9 @@ import { FormArray, FormControl, NgForm, Validators } from '@angular/forms'; import _ from 'lodash'; -import { NfsService } from '../../../shared/api/nfs.service'; -import { Icons } from '../../../shared/enum/icons.enum'; -import { CdFormGroup } from '../../../shared/forms/cd-form-group'; +import { NfsService } from '~/app/shared/api/nfs.service'; +import { Icons } from '~/app/shared/enum/icons.enum'; +import { CdFormGroup } from '~/app/shared/forms/cd-form-group'; @Component({ selector: 'cd-nfs-form-client', diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/nfs/nfs-form/nfs-form.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/nfs/nfs-form/nfs-form.component.spec.ts index 66b8af29b01..0ee32d15c85 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/nfs/nfs-form/nfs-form.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/nfs/nfs-form/nfs-form.component.spec.ts @@ -7,10 +7,10 @@ import { RouterTestingModule } from '@angular/router/testing'; import { NgbTypeaheadModule } from '@ng-bootstrap/ng-bootstrap'; import { ToastrModule } from 'ngx-toastr'; -import { ActivatedRouteStub } from '../../../../testing/activated-route-stub'; -import { configureTestBed } from '../../../../testing/unit-test-helper'; -import { LoadingPanelComponent } from '../../../shared/components/loading-panel/loading-panel.component'; -import { SharedModule } from '../../../shared/shared.module'; +import { ActivatedRouteStub } from '~/testing/activated-route-stub'; +import { configureTestBed } from '~/testing/unit-test-helper'; +import { LoadingPanelComponent } from '~/app/shared/components/loading-panel/loading-panel.component'; +import { SharedModule } from '~/app/shared/shared.module'; import { NfsFormClientComponent } from '../nfs-form-client/nfs-form-client.component'; import { NfsFormComponent } from './nfs-form.component'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/nfs/nfs-form/nfs-form.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/nfs/nfs-form/nfs-form.component.ts index d51ef427149..d24c0709655 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/nfs/nfs-form/nfs-form.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/nfs/nfs-form/nfs-form.component.ts @@ -6,20 +6,20 @@ import _ from 'lodash'; import { forkJoin, Observable, of } from 'rxjs'; import { debounceTime, distinctUntilChanged, map, mergeMap } from 'rxjs/operators'; -import { NfsService } from '../../../shared/api/nfs.service'; -import { RgwUserService } from '../../../shared/api/rgw-user.service'; -import { SelectMessages } from '../../../shared/components/select/select-messages.model'; -import { SelectOption } from '../../../shared/components/select/select-option.model'; -import { ActionLabelsI18n } from '../../../shared/constants/app.constants'; -import { Icons } from '../../../shared/enum/icons.enum'; -import { CdForm } from '../../../shared/forms/cd-form'; -import { CdFormBuilder } from '../../../shared/forms/cd-form-builder'; -import { CdFormGroup } from '../../../shared/forms/cd-form-group'; -import { CdValidators } from '../../../shared/forms/cd-validators'; -import { FinishedTask } from '../../../shared/models/finished-task'; -import { Permission } from '../../../shared/models/permissions'; -import { AuthStorageService } from '../../../shared/services/auth-storage.service'; -import { TaskWrapperService } from '../../../shared/services/task-wrapper.service'; +import { NfsService } from '~/app/shared/api/nfs.service'; +import { RgwUserService } from '~/app/shared/api/rgw-user.service'; +import { SelectMessages } from '~/app/shared/components/select/select-messages.model'; +import { SelectOption } from '~/app/shared/components/select/select-option.model'; +import { ActionLabelsI18n } from '~/app/shared/constants/app.constants'; +import { Icons } from '~/app/shared/enum/icons.enum'; +import { CdForm } from '~/app/shared/forms/cd-form'; +import { CdFormBuilder } from '~/app/shared/forms/cd-form-builder'; +import { CdFormGroup } from '~/app/shared/forms/cd-form-group'; +import { CdValidators } from '~/app/shared/forms/cd-validators'; +import { FinishedTask } from '~/app/shared/models/finished-task'; +import { Permission } from '~/app/shared/models/permissions'; +import { AuthStorageService } from '~/app/shared/services/auth-storage.service'; +import { TaskWrapperService } from '~/app/shared/services/task-wrapper.service'; import { NfsFormClientComponent } from '../nfs-form-client/nfs-form-client.component'; @Component({ diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/nfs/nfs-list/nfs-list.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/nfs/nfs-list/nfs-list.component.spec.ts index 1748b725582..294afb0e145 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/nfs/nfs-list/nfs-list.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/nfs/nfs-list/nfs-list.component.spec.ts @@ -11,14 +11,14 @@ import { configureTestBed, expectItemTasks, PermissionHelper -} from '../../../../testing/unit-test-helper'; -import { NfsService } from '../../../shared/api/nfs.service'; -import { TableActionsComponent } from '../../../shared/datatable/table-actions/table-actions.component'; -import { ExecutingTask } from '../../../shared/models/executing-task'; -import { Summary } from '../../../shared/models/summary.model'; -import { SummaryService } from '../../../shared/services/summary.service'; -import { TaskListService } from '../../../shared/services/task-list.service'; -import { SharedModule } from '../../../shared/shared.module'; +} from '~/testing/unit-test-helper'; +import { NfsService } from '~/app/shared/api/nfs.service'; +import { TableActionsComponent } from '~/app/shared/datatable/table-actions/table-actions.component'; +import { ExecutingTask } from '~/app/shared/models/executing-task'; +import { Summary } from '~/app/shared/models/summary.model'; +import { SummaryService } from '~/app/shared/services/summary.service'; +import { TaskListService } from '~/app/shared/services/task-list.service'; +import { SharedModule } from '~/app/shared/shared.module'; import { NfsDetailsComponent } from '../nfs-details/nfs-details.component'; import { NfsListComponent } from './nfs-list.component'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/nfs/nfs-list/nfs-list.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/nfs/nfs-list/nfs-list.component.ts index 817533ad30c..70ff67eaf8c 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/nfs/nfs-list/nfs-list.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/nfs/nfs-list/nfs-list.component.ts @@ -4,24 +4,24 @@ import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; import _ from 'lodash'; import { Subscription } from 'rxjs'; -import { NfsService } from '../../../shared/api/nfs.service'; -import { ListWithDetails } from '../../../shared/classes/list-with-details.class'; -import { CriticalConfirmationModalComponent } from '../../../shared/components/critical-confirmation-modal/critical-confirmation-modal.component'; -import { ActionLabelsI18n } from '../../../shared/constants/app.constants'; -import { TableComponent } from '../../../shared/datatable/table/table.component'; -import { CellTemplate } from '../../../shared/enum/cell-template.enum'; -import { Icons } from '../../../shared/enum/icons.enum'; -import { ViewCacheStatus } from '../../../shared/enum/view-cache-status.enum'; -import { CdTableAction } from '../../../shared/models/cd-table-action'; -import { CdTableColumn } from '../../../shared/models/cd-table-column'; -import { CdTableSelection } from '../../../shared/models/cd-table-selection'; -import { FinishedTask } from '../../../shared/models/finished-task'; -import { Permission } from '../../../shared/models/permissions'; -import { Task } from '../../../shared/models/task'; -import { AuthStorageService } from '../../../shared/services/auth-storage.service'; -import { ModalService } from '../../../shared/services/modal.service'; -import { TaskListService } from '../../../shared/services/task-list.service'; -import { TaskWrapperService } from '../../../shared/services/task-wrapper.service'; +import { NfsService } from '~/app/shared/api/nfs.service'; +import { ListWithDetails } from '~/app/shared/classes/list-with-details.class'; +import { CriticalConfirmationModalComponent } from '~/app/shared/components/critical-confirmation-modal/critical-confirmation-modal.component'; +import { ActionLabelsI18n } from '~/app/shared/constants/app.constants'; +import { TableComponent } from '~/app/shared/datatable/table/table.component'; +import { CellTemplate } from '~/app/shared/enum/cell-template.enum'; +import { Icons } from '~/app/shared/enum/icons.enum'; +import { ViewCacheStatus } from '~/app/shared/enum/view-cache-status.enum'; +import { CdTableAction } from '~/app/shared/models/cd-table-action'; +import { CdTableColumn } from '~/app/shared/models/cd-table-column'; +import { CdTableSelection } from '~/app/shared/models/cd-table-selection'; +import { FinishedTask } from '~/app/shared/models/finished-task'; +import { Permission } from '~/app/shared/models/permissions'; +import { Task } from '~/app/shared/models/task'; +import { AuthStorageService } from '~/app/shared/services/auth-storage.service'; +import { ModalService } from '~/app/shared/services/modal.service'; +import { TaskListService } from '~/app/shared/services/task-list.service'; +import { TaskWrapperService } from '~/app/shared/services/task-wrapper.service'; @Component({ selector: 'cd-nfs-list', diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/nfs/nfs.module.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/nfs/nfs.module.ts index c20e226c96a..b19b742cea1 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/nfs/nfs.module.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/nfs/nfs.module.ts @@ -5,7 +5,7 @@ import { RouterModule } from '@angular/router'; import { NgbNavModule, NgbTooltipModule, NgbTypeaheadModule } from '@ng-bootstrap/ng-bootstrap'; -import { SharedModule } from '../../shared/shared.module'; +import { SharedModule } from '~/app/shared/shared.module'; import { Nfs501Component } from './nfs-501/nfs-501.component'; import { NfsDetailsComponent } from './nfs-details/nfs-details.component'; import { NfsFormClientComponent } from './nfs-form-client/nfs-form-client.component'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/performance-counter/performance-counter.module.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/performance-counter/performance-counter.module.ts index 6e0967a4850..9beb530118f 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/performance-counter/performance-counter.module.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/performance-counter/performance-counter.module.ts @@ -2,7 +2,7 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; -import { SharedModule } from '../../shared/shared.module'; +import { SharedModule } from '~/app/shared/shared.module'; import { PerformanceCounterComponent } from './performance-counter/performance-counter.component'; import { TablePerformanceCounterComponent } from './table-performance-counter/table-performance-counter.component'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/performance-counter/performance-counter/performance-counter.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/performance-counter/performance-counter/performance-counter.component.spec.ts index 3f3affe6858..4fe5688bc59 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/performance-counter/performance-counter/performance-counter.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/performance-counter/performance-counter/performance-counter.component.spec.ts @@ -3,8 +3,8 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { RouterTestingModule } from '@angular/router/testing'; -import { configureTestBed } from '../../../../testing/unit-test-helper'; -import { SharedModule } from '../../../shared/shared.module'; +import { configureTestBed } from '~/testing/unit-test-helper'; +import { SharedModule } from '~/app/shared/shared.module'; import { TablePerformanceCounterComponent } from '../table-performance-counter/table-performance-counter.component'; import { PerformanceCounterComponent } from './performance-counter.component'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/performance-counter/table-performance-counter/table-performance-counter.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/performance-counter/table-performance-counter/table-performance-counter.component.spec.ts index 4ca483cf671..a05a6ccdb89 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/performance-counter/table-performance-counter/table-performance-counter.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/performance-counter/table-performance-counter/table-performance-counter.component.spec.ts @@ -1,9 +1,9 @@ import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { configureTestBed } from '../../../../testing/unit-test-helper'; -import { AppModule } from '../../../app.module'; -import { CdTableFetchDataContext } from '../../../shared/models/cd-table-fetch-data-context'; +import { configureTestBed } from '~/testing/unit-test-helper'; +import { AppModule } from '~/app/app.module'; +import { CdTableFetchDataContext } from '~/app/shared/models/cd-table-fetch-data-context'; import { TablePerformanceCounterComponent } from './table-performance-counter.component'; describe('TablePerformanceCounterComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/performance-counter/table-performance-counter/table-performance-counter.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/performance-counter/table-performance-counter/table-performance-counter.component.ts index 0e069833697..e2e0194de84 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/performance-counter/table-performance-counter/table-performance-counter.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/performance-counter/table-performance-counter/table-performance-counter.component.ts @@ -1,8 +1,8 @@ import { Component, Input, OnInit, TemplateRef, ViewChild } from '@angular/core'; -import { PerformanceCounterService } from '../../../shared/api/performance-counter.service'; -import { CdTableColumn } from '../../../shared/models/cd-table-column'; -import { CdTableFetchDataContext } from '../../../shared/models/cd-table-fetch-data-context'; +import { PerformanceCounterService } from '~/app/shared/api/performance-counter.service'; +import { CdTableColumn } from '~/app/shared/models/cd-table-column'; +import { CdTableFetchDataContext } from '~/app/shared/models/cd-table-fetch-data-context'; /** * Display the specified performance counters in a datatable. diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/crush-rule-form-modal/crush-rule-form-modal.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/crush-rule-form-modal/crush-rule-form-modal.component.spec.ts index c4bd4dd66ab..d70863cdf93 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/crush-rule-form-modal/crush-rule-form-modal.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/crush-rule-form-modal/crush-rule-form-modal.component.spec.ts @@ -11,11 +11,11 @@ import { FixtureHelper, FormHelper, Mocks -} from '../../../../testing/unit-test-helper'; -import { CrushRuleService } from '../../../shared/api/crush-rule.service'; -import { CrushNode } from '../../../shared/models/crush-node'; -import { CrushRuleConfig } from '../../../shared/models/crush-rule'; -import { TaskWrapperService } from '../../../shared/services/task-wrapper.service'; +} from '~/testing/unit-test-helper'; +import { CrushRuleService } from '~/app/shared/api/crush-rule.service'; +import { CrushNode } from '~/app/shared/models/crush-node'; +import { CrushRuleConfig } from '~/app/shared/models/crush-rule'; +import { TaskWrapperService } from '~/app/shared/services/task-wrapper.service'; import { PoolModule } from '../pool.module'; import { CrushRuleFormModalComponent } from './crush-rule-form-modal.component'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/crush-rule-form-modal/crush-rule-form-modal.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/crush-rule-form-modal/crush-rule-form-modal.component.ts index ef3f38fb774..308b09d7216 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/crush-rule-form-modal/crush-rule-form-modal.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/crush-rule-form-modal/crush-rule-form-modal.component.ts @@ -4,15 +4,15 @@ import { Validators } from '@angular/forms'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import _ from 'lodash'; -import { CrushRuleService } from '../../../shared/api/crush-rule.service'; -import { CrushNodeSelectionClass } from '../../../shared/classes/crush.node.selection.class'; -import { ActionLabelsI18n } from '../../../shared/constants/app.constants'; -import { CdFormBuilder } from '../../../shared/forms/cd-form-builder'; -import { CdFormGroup } from '../../../shared/forms/cd-form-group'; -import { CdValidators } from '../../../shared/forms/cd-validators'; -import { CrushNode } from '../../../shared/models/crush-node'; -import { FinishedTask } from '../../../shared/models/finished-task'; -import { TaskWrapperService } from '../../../shared/services/task-wrapper.service'; +import { CrushRuleService } from '~/app/shared/api/crush-rule.service'; +import { CrushNodeSelectionClass } from '~/app/shared/classes/crush.node.selection.class'; +import { ActionLabelsI18n } from '~/app/shared/constants/app.constants'; +import { CdFormBuilder } from '~/app/shared/forms/cd-form-builder'; +import { CdFormGroup } from '~/app/shared/forms/cd-form-group'; +import { CdValidators } from '~/app/shared/forms/cd-validators'; +import { CrushNode } from '~/app/shared/models/crush-node'; +import { FinishedTask } from '~/app/shared/models/finished-task'; +import { TaskWrapperService } from '~/app/shared/services/task-wrapper.service'; @Component({ selector: 'cd-crush-rule-form-modal', diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/erasure-code-profile-form/erasure-code-profile-form-modal.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/erasure-code-profile-form/erasure-code-profile-form-modal.component.spec.ts index 9a7cb43674b..f07d9192773 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/erasure-code-profile-form/erasure-code-profile-form-modal.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/erasure-code-profile-form/erasure-code-profile-form-modal.component.spec.ts @@ -11,11 +11,11 @@ import { FixtureHelper, FormHelper, Mocks -} from '../../../../testing/unit-test-helper'; -import { ErasureCodeProfileService } from '../../../shared/api/erasure-code-profile.service'; -import { CrushNode } from '../../../shared/models/crush-node'; -import { ErasureCodeProfile } from '../../../shared/models/erasure-code-profile'; -import { TaskWrapperService } from '../../../shared/services/task-wrapper.service'; +} from '~/testing/unit-test-helper'; +import { ErasureCodeProfileService } from '~/app/shared/api/erasure-code-profile.service'; +import { CrushNode } from '~/app/shared/models/crush-node'; +import { ErasureCodeProfile } from '~/app/shared/models/erasure-code-profile'; +import { TaskWrapperService } from '~/app/shared/services/task-wrapper.service'; import { PoolModule } from '../pool.module'; import { ErasureCodeProfileFormModalComponent } from './erasure-code-profile-form-modal.component'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/erasure-code-profile-form/erasure-code-profile-form-modal.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/erasure-code-profile-form/erasure-code-profile-form-modal.component.ts index 1245695a8f6..c0e5e59be29 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/erasure-code-profile-form/erasure-code-profile-form-modal.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/erasure-code-profile-form/erasure-code-profile-form-modal.component.ts @@ -3,17 +3,17 @@ import { Validators } from '@angular/forms'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; -import { ErasureCodeProfileService } from '../../../shared/api/erasure-code-profile.service'; -import { CrushNodeSelectionClass } from '../../../shared/classes/crush.node.selection.class'; -import { ActionLabelsI18n } from '../../../shared/constants/app.constants'; -import { Icons } from '../../../shared/enum/icons.enum'; -import { CdFormBuilder } from '../../../shared/forms/cd-form-builder'; -import { CdFormGroup } from '../../../shared/forms/cd-form-group'; -import { CdValidators } from '../../../shared/forms/cd-validators'; -import { CrushNode } from '../../../shared/models/crush-node'; -import { ErasureCodeProfile } from '../../../shared/models/erasure-code-profile'; -import { FinishedTask } from '../../../shared/models/finished-task'; -import { TaskWrapperService } from '../../../shared/services/task-wrapper.service'; +import { ErasureCodeProfileService } from '~/app/shared/api/erasure-code-profile.service'; +import { CrushNodeSelectionClass } from '~/app/shared/classes/crush.node.selection.class'; +import { ActionLabelsI18n } from '~/app/shared/constants/app.constants'; +import { Icons } from '~/app/shared/enum/icons.enum'; +import { CdFormBuilder } from '~/app/shared/forms/cd-form-builder'; +import { CdFormGroup } from '~/app/shared/forms/cd-form-group'; +import { CdValidators } from '~/app/shared/forms/cd-validators'; +import { CrushNode } from '~/app/shared/models/crush-node'; +import { ErasureCodeProfile } from '~/app/shared/models/erasure-code-profile'; +import { FinishedTask } from '~/app/shared/models/finished-task'; +import { TaskWrapperService } from '~/app/shared/services/task-wrapper.service'; @Component({ selector: 'cd-erasure-code-profile-form-modal', diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-details/pool-details.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-details/pool-details.component.spec.ts index 511257b7f85..522fcda8197 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-details/pool-details.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-details/pool-details.component.spec.ts @@ -6,10 +6,10 @@ import { RouterTestingModule } from '@angular/router/testing'; import { NgbNavModule } from '@ng-bootstrap/ng-bootstrap'; -import { configureTestBed, Mocks, TabHelper } from '../../../../testing/unit-test-helper'; -import { Permissions } from '../../../shared/models/permissions'; -import { SharedModule } from '../../../shared/shared.module'; -import { RbdConfigurationListComponent } from '../../block/rbd-configuration-list/rbd-configuration-list.component'; +import { configureTestBed, Mocks, TabHelper } from '~/testing/unit-test-helper'; +import { Permissions } from '~/app/shared/models/permissions'; +import { SharedModule } from '~/app/shared/shared.module'; +import { RbdConfigurationListComponent } from '~/app/ceph/block/rbd-configuration-list/rbd-configuration-list.component'; import { PoolDetailsComponent } from './pool-details.component'; describe('PoolDetailsComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-details/pool-details.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-details/pool-details.component.ts index 584c3022e0d..21f3ae9719b 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-details/pool-details.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-details/pool-details.component.ts @@ -2,11 +2,11 @@ import { ChangeDetectionStrategy, Component, Input, OnChanges } from '@angular/c import _ from 'lodash'; -import { PoolService } from '../../../shared/api/pool.service'; -import { CdHelperClass } from '../../../shared/classes/cd-helper.class'; -import { CdTableColumn } from '../../../shared/models/cd-table-column'; -import { RbdConfigurationEntry } from '../../../shared/models/configuration'; -import { Permissions } from '../../../shared/models/permissions'; +import { PoolService } from '~/app/shared/api/pool.service'; +import { CdHelperClass } from '~/app/shared/classes/cd-helper.class'; +import { CdTableColumn } from '~/app/shared/models/cd-table-column'; +import { RbdConfigurationEntry } from '~/app/shared/models/configuration'; +import { Permissions } from '~/app/shared/models/permissions'; @Component({ selector: 'cd-pool-details', diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-form/pool-form-data.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-form/pool-form-data.ts index c0cd2438672..2c5dc57eb5b 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-form/pool-form-data.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-form/pool-form-data.ts @@ -1,6 +1,6 @@ import { Validators } from '@angular/forms'; -import { SelectMessages } from '../../../shared/components/select/select-messages.model'; +import { SelectMessages } from '~/app/shared/components/select/select-messages.model'; import { Pool } from '../pool'; export class PoolFormData { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-form/pool-form.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-form/pool-form.component.spec.ts index a11c17177c7..db5b1ab3639 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-form/pool-form.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-form/pool-form.component.spec.ts @@ -22,20 +22,20 @@ import { FormHelper, Mocks, modalServiceShow -} from '../../../../testing/unit-test-helper'; -import { NotFoundComponent } from '../../../core/not-found/not-found.component'; -import { CrushRuleService } from '../../../shared/api/crush-rule.service'; -import { ErasureCodeProfileService } from '../../../shared/api/erasure-code-profile.service'; -import { PoolService } from '../../../shared/api/pool.service'; -import { CriticalConfirmationModalComponent } from '../../../shared/components/critical-confirmation-modal/critical-confirmation-modal.component'; -import { SelectBadgesComponent } from '../../../shared/components/select-badges/select-badges.component'; -import { CdFormGroup } from '../../../shared/forms/cd-form-group'; -import { ErasureCodeProfile } from '../../../shared/models/erasure-code-profile'; -import { Permission } from '../../../shared/models/permissions'; -import { PoolFormInfo } from '../../../shared/models/pool-form-info'; -import { AuthStorageService } from '../../../shared/services/auth-storage.service'; -import { ModalService } from '../../../shared/services/modal.service'; -import { TaskWrapperService } from '../../../shared/services/task-wrapper.service'; +} from '~/testing/unit-test-helper'; +import { NotFoundComponent } from '~/app/core/not-found/not-found.component'; +import { CrushRuleService } from '~/app/shared/api/crush-rule.service'; +import { ErasureCodeProfileService } from '~/app/shared/api/erasure-code-profile.service'; +import { PoolService } from '~/app/shared/api/pool.service'; +import { CriticalConfirmationModalComponent } from '~/app/shared/components/critical-confirmation-modal/critical-confirmation-modal.component'; +import { SelectBadgesComponent } from '~/app/shared/components/select-badges/select-badges.component'; +import { CdFormGroup } from '~/app/shared/forms/cd-form-group'; +import { ErasureCodeProfile } from '~/app/shared/models/erasure-code-profile'; +import { Permission } from '~/app/shared/models/permissions'; +import { PoolFormInfo } from '~/app/shared/models/pool-form-info'; +import { AuthStorageService } from '~/app/shared/services/auth-storage.service'; +import { ModalService } from '~/app/shared/services/modal.service'; +import { TaskWrapperService } from '~/app/shared/services/task-wrapper.service'; import { Pool } from '../pool'; import { PoolModule } from '../pool.module'; import { PoolFormComponent } from './pool-form.component'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-form/pool-form.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-form/pool-form.component.ts index b590e8b82d7..ad70234dcea 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-form/pool-form.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-form/pool-form.component.ts @@ -6,32 +6,32 @@ import { NgbNav, NgbTooltip } from '@ng-bootstrap/ng-bootstrap'; import _ from 'lodash'; import { Observable, Subscription } from 'rxjs'; -import { CrushRuleService } from '../../../shared/api/crush-rule.service'; -import { ErasureCodeProfileService } from '../../../shared/api/erasure-code-profile.service'; -import { PoolService } from '../../../shared/api/pool.service'; -import { CrushNodeSelectionClass } from '../../../shared/classes/crush.node.selection.class'; -import { CriticalConfirmationModalComponent } from '../../../shared/components/critical-confirmation-modal/critical-confirmation-modal.component'; -import { SelectOption } from '../../../shared/components/select/select-option.model'; -import { ActionLabelsI18n, URLVerbs } from '../../../shared/constants/app.constants'; -import { Icons } from '../../../shared/enum/icons.enum'; -import { CdForm } from '../../../shared/forms/cd-form'; -import { CdFormGroup } from '../../../shared/forms/cd-form-group'; -import { CdValidators } from '../../../shared/forms/cd-validators'; +import { CrushRuleService } from '~/app/shared/api/crush-rule.service'; +import { ErasureCodeProfileService } from '~/app/shared/api/erasure-code-profile.service'; +import { PoolService } from '~/app/shared/api/pool.service'; +import { CrushNodeSelectionClass } from '~/app/shared/classes/crush.node.selection.class'; +import { CriticalConfirmationModalComponent } from '~/app/shared/components/critical-confirmation-modal/critical-confirmation-modal.component'; +import { SelectOption } from '~/app/shared/components/select/select-option.model'; +import { ActionLabelsI18n, URLVerbs } from '~/app/shared/constants/app.constants'; +import { Icons } from '~/app/shared/enum/icons.enum'; +import { CdForm } from '~/app/shared/forms/cd-form'; +import { CdFormGroup } from '~/app/shared/forms/cd-form-group'; +import { CdValidators } from '~/app/shared/forms/cd-validators'; import { RbdConfigurationEntry, RbdConfigurationSourceField -} from '../../../shared/models/configuration'; -import { CrushRule } from '../../../shared/models/crush-rule'; -import { CrushStep } from '../../../shared/models/crush-step'; -import { ErasureCodeProfile } from '../../../shared/models/erasure-code-profile'; -import { FinishedTask } from '../../../shared/models/finished-task'; -import { Permission } from '../../../shared/models/permissions'; -import { PoolFormInfo } from '../../../shared/models/pool-form-info'; -import { DimlessBinaryPipe } from '../../../shared/pipes/dimless-binary.pipe'; -import { AuthStorageService } from '../../../shared/services/auth-storage.service'; -import { FormatterService } from '../../../shared/services/formatter.service'; -import { ModalService } from '../../../shared/services/modal.service'; -import { TaskWrapperService } from '../../../shared/services/task-wrapper.service'; +} from '~/app/shared/models/configuration'; +import { CrushRule } from '~/app/shared/models/crush-rule'; +import { CrushStep } from '~/app/shared/models/crush-step'; +import { ErasureCodeProfile } from '~/app/shared/models/erasure-code-profile'; +import { FinishedTask } from '~/app/shared/models/finished-task'; +import { Permission } from '~/app/shared/models/permissions'; +import { PoolFormInfo } from '~/app/shared/models/pool-form-info'; +import { DimlessBinaryPipe } from '~/app/shared/pipes/dimless-binary.pipe'; +import { AuthStorageService } from '~/app/shared/services/auth-storage.service'; +import { FormatterService } from '~/app/shared/services/formatter.service'; +import { ModalService } from '~/app/shared/services/modal.service'; +import { TaskWrapperService } from '~/app/shared/services/task-wrapper.service'; import { CrushRuleFormModalComponent } from '../crush-rule-form-modal/crush-rule-form-modal.component'; import { ErasureCodeProfileFormModalComponent } from '../erasure-code-profile-form/erasure-code-profile-form-modal.component'; import { Pool } from '../pool'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-list/pool-list.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-list/pool-list.component.spec.ts index f661a7d9b0a..3a4fa49ecf4 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-list/pool-list.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-list/pool-list.component.spec.ts @@ -8,18 +8,18 @@ import _ from 'lodash'; import { ToastrModule } from 'ngx-toastr'; import { of } from 'rxjs'; -import { configureTestBed, expectItemTasks, Mocks } from '../../../../testing/unit-test-helper'; -import { ConfigurationService } from '../../../shared/api/configuration.service'; -import { PoolService } from '../../../shared/api/pool.service'; -import { CriticalConfirmationModalComponent } from '../../../shared/components/critical-confirmation-modal/critical-confirmation-modal.component'; -import { ExecutingTask } from '../../../shared/models/executing-task'; -import { AuthStorageService } from '../../../shared/services/auth-storage.service'; -import { ModalService } from '../../../shared/services/modal.service'; -import { SummaryService } from '../../../shared/services/summary.service'; -import { TaskWrapperService } from '../../../shared/services/task-wrapper.service'; -import { SharedModule } from '../../../shared/shared.module'; -import { RbdConfigurationListComponent } from '../../block/rbd-configuration-list/rbd-configuration-list.component'; -import { PgCategoryService } from '../../shared/pg-category.service'; +import { configureTestBed, expectItemTasks, Mocks } from '~/testing/unit-test-helper'; +import { ConfigurationService } from '~/app/shared/api/configuration.service'; +import { PoolService } from '~/app/shared/api/pool.service'; +import { CriticalConfirmationModalComponent } from '~/app/shared/components/critical-confirmation-modal/critical-confirmation-modal.component'; +import { ExecutingTask } from '~/app/shared/models/executing-task'; +import { AuthStorageService } from '~/app/shared/services/auth-storage.service'; +import { ModalService } from '~/app/shared/services/modal.service'; +import { SummaryService } from '~/app/shared/services/summary.service'; +import { TaskWrapperService } from '~/app/shared/services/task-wrapper.service'; +import { SharedModule } from '~/app/shared/shared.module'; +import { RbdConfigurationListComponent } from '~/app/ceph/block/rbd-configuration-list/rbd-configuration-list.component'; +import { PgCategoryService } from '~/app/ceph/shared/pg-category.service'; import { Pool } from '../pool'; import { PoolDetailsComponent } from '../pool-details/pool-details.component'; import { PoolListComponent } from './pool-list.component'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-list/pool-list.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-list/pool-list.component.ts index 4a6eca8298c..d9c9b371c89 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-list/pool-list.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-list/pool-list.component.ts @@ -2,29 +2,29 @@ import { Component, OnInit, TemplateRef, ViewChild } from '@angular/core'; import _ from 'lodash'; -import { ConfigurationService } from '../../../shared/api/configuration.service'; -import { PoolService } from '../../../shared/api/pool.service'; -import { ListWithDetails } from '../../../shared/classes/list-with-details.class'; -import { TableStatusViewCache } from '../../../shared/classes/table-status-view-cache'; -import { CriticalConfirmationModalComponent } from '../../../shared/components/critical-confirmation-modal/critical-confirmation-modal.component'; -import { ActionLabelsI18n, URLVerbs } from '../../../shared/constants/app.constants'; -import { TableComponent } from '../../../shared/datatable/table/table.component'; -import { CellTemplate } from '../../../shared/enum/cell-template.enum'; -import { Icons } from '../../../shared/enum/icons.enum'; -import { ViewCacheStatus } from '../../../shared/enum/view-cache-status.enum'; -import { CdTableAction } from '../../../shared/models/cd-table-action'; -import { CdTableColumn } from '../../../shared/models/cd-table-column'; -import { CdTableSelection } from '../../../shared/models/cd-table-selection'; -import { ExecutingTask } from '../../../shared/models/executing-task'; -import { FinishedTask } from '../../../shared/models/finished-task'; -import { Permissions } from '../../../shared/models/permissions'; -import { DimlessPipe } from '../../../shared/pipes/dimless.pipe'; -import { AuthStorageService } from '../../../shared/services/auth-storage.service'; -import { ModalService } from '../../../shared/services/modal.service'; -import { TaskListService } from '../../../shared/services/task-list.service'; -import { TaskWrapperService } from '../../../shared/services/task-wrapper.service'; -import { URLBuilderService } from '../../../shared/services/url-builder.service'; -import { PgCategoryService } from '../../shared/pg-category.service'; +import { ConfigurationService } from '~/app/shared/api/configuration.service'; +import { PoolService } from '~/app/shared/api/pool.service'; +import { ListWithDetails } from '~/app/shared/classes/list-with-details.class'; +import { TableStatusViewCache } from '~/app/shared/classes/table-status-view-cache'; +import { CriticalConfirmationModalComponent } from '~/app/shared/components/critical-confirmation-modal/critical-confirmation-modal.component'; +import { ActionLabelsI18n, URLVerbs } from '~/app/shared/constants/app.constants'; +import { TableComponent } from '~/app/shared/datatable/table/table.component'; +import { CellTemplate } from '~/app/shared/enum/cell-template.enum'; +import { Icons } from '~/app/shared/enum/icons.enum'; +import { ViewCacheStatus } from '~/app/shared/enum/view-cache-status.enum'; +import { CdTableAction } from '~/app/shared/models/cd-table-action'; +import { CdTableColumn } from '~/app/shared/models/cd-table-column'; +import { CdTableSelection } from '~/app/shared/models/cd-table-selection'; +import { ExecutingTask } from '~/app/shared/models/executing-task'; +import { FinishedTask } from '~/app/shared/models/finished-task'; +import { Permissions } from '~/app/shared/models/permissions'; +import { DimlessPipe } from '~/app/shared/pipes/dimless.pipe'; +import { AuthStorageService } from '~/app/shared/services/auth-storage.service'; +import { ModalService } from '~/app/shared/services/modal.service'; +import { TaskListService } from '~/app/shared/services/task-list.service'; +import { TaskWrapperService } from '~/app/shared/services/task-wrapper.service'; +import { URLBuilderService } from '~/app/shared/services/url-builder.service'; +import { PgCategoryService } from '~/app/ceph/shared/pg-category.service'; import { Pool } from '../pool'; import { PoolStat, PoolStats } from '../pool-stat'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool.module.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool.module.ts index b134f3a1a35..3f01b9fd9c5 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool.module.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool.module.ts @@ -5,8 +5,8 @@ import { RouterModule, Routes } from '@angular/router'; import { NgbNavModule, NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap'; -import { ActionLabels, URLVerbs } from '../../shared/constants/app.constants'; -import { SharedModule } from '../../shared/shared.module'; +import { ActionLabels, URLVerbs } from '~/app/shared/constants/app.constants'; +import { SharedModule } from '~/app/shared/shared.module'; import { BlockModule } from '../block/block.module'; import { CephSharedModule } from '../shared/ceph-shared.module'; import { CrushRuleFormModalComponent } from './crush-rule-form-modal/crush-rule-form-modal.component'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool.ts index b822812c19a..55c70c6f559 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool.ts @@ -1,4 +1,4 @@ -import { ExecutingTask } from '../../shared/models/executing-task'; +import { ExecutingTask } from '~/app/shared/models/executing-task'; import { PoolStats } from './pool-stat'; export class Pool { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-501/rgw-501.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-501/rgw-501.component.spec.ts index 75941b9e30b..c0bf5e4bc7f 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-501/rgw-501.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-501/rgw-501.component.spec.ts @@ -2,8 +2,8 @@ import { HttpClientTestingModule } from '@angular/common/http/testing'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; -import { configureTestBed } from '../../../../testing/unit-test-helper'; -import { SharedModule } from '../../../shared/shared.module'; +import { configureTestBed } from '~/testing/unit-test-helper'; +import { SharedModule } from '~/app/shared/shared.module'; import { Rgw501Component } from './rgw-501.component'; describe('Rgw501Component', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-details/rgw-bucket-details.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-details/rgw-bucket-details.component.spec.ts index dd6ccf4cd6d..b80efbe1cab 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-details/rgw-bucket-details.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-details/rgw-bucket-details.component.spec.ts @@ -3,10 +3,10 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { of } from 'rxjs'; -import { configureTestBed } from '../../../../testing/unit-test-helper'; -import { RgwBucketService } from '../../../shared/api/rgw-bucket.service'; -import { CdTableSelection } from '../../../shared/models/cd-table-selection'; -import { SharedModule } from '../../../shared/shared.module'; +import { configureTestBed } from '~/testing/unit-test-helper'; +import { RgwBucketService } from '~/app/shared/api/rgw-bucket.service'; +import { CdTableSelection } from '~/app/shared/models/cd-table-selection'; +import { SharedModule } from '~/app/shared/shared.module'; import { RgwBucketDetailsComponent } from './rgw-bucket-details.component'; describe('RgwBucketDetailsComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-details/rgw-bucket-details.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-details/rgw-bucket-details.component.ts index adf0b13d310..5ec44bcbd32 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-details/rgw-bucket-details.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-details/rgw-bucket-details.component.ts @@ -1,6 +1,6 @@ import { Component, Input, OnChanges } from '@angular/core'; -import { RgwBucketService } from '../../../shared/api/rgw-bucket.service'; +import { RgwBucketService } from '~/app/shared/api/rgw-bucket.service'; @Component({ selector: 'cd-rgw-bucket-details', diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-form/rgw-bucket-form.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-form/rgw-bucket-form.component.spec.ts index ad84c1a52f9..93cbb449332 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-form/rgw-bucket-form.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-form/rgw-bucket-form.component.spec.ts @@ -8,13 +8,13 @@ import _ from 'lodash'; import { ToastrModule } from 'ngx-toastr'; import { of as observableOf } from 'rxjs'; -import { configureTestBed, FormHelper } from '../../../../testing/unit-test-helper'; -import { RgwBucketService } from '../../../shared/api/rgw-bucket.service'; -import { RgwSiteService } from '../../../shared/api/rgw-site.service'; -import { RgwUserService } from '../../../shared/api/rgw-user.service'; -import { NotificationType } from '../../../shared/enum/notification-type.enum'; -import { NotificationService } from '../../../shared/services/notification.service'; -import { SharedModule } from '../../../shared/shared.module'; +import { configureTestBed, FormHelper } from '~/testing/unit-test-helper'; +import { RgwBucketService } from '~/app/shared/api/rgw-bucket.service'; +import { RgwSiteService } from '~/app/shared/api/rgw-site.service'; +import { RgwUserService } from '~/app/shared/api/rgw-user.service'; +import { NotificationType } from '~/app/shared/enum/notification-type.enum'; +import { NotificationService } from '~/app/shared/services/notification.service'; +import { SharedModule } from '~/app/shared/shared.module'; import { RgwBucketMfaDelete } from '../models/rgw-bucket-mfa-delete'; import { RgwBucketVersioning } from '../models/rgw-bucket-versioning'; import { RgwBucketFormComponent } from './rgw-bucket-form.component'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-form/rgw-bucket-form.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-form/rgw-bucket-form.component.ts index 658d6fcb559..8bf17755d67 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-form/rgw-bucket-form.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-form/rgw-bucket-form.component.ts @@ -5,17 +5,17 @@ import { ActivatedRoute, Router } from '@angular/router'; import _ from 'lodash'; import { forkJoin } from 'rxjs'; -import { RgwBucketService } from '../../../shared/api/rgw-bucket.service'; -import { RgwSiteService } from '../../../shared/api/rgw-site.service'; -import { RgwUserService } from '../../../shared/api/rgw-user.service'; -import { ActionLabelsI18n, URLVerbs } from '../../../shared/constants/app.constants'; -import { Icons } from '../../../shared/enum/icons.enum'; -import { NotificationType } from '../../../shared/enum/notification-type.enum'; -import { CdForm } from '../../../shared/forms/cd-form'; -import { CdFormBuilder } from '../../../shared/forms/cd-form-builder'; -import { CdFormGroup } from '../../../shared/forms/cd-form-group'; -import { CdValidators } from '../../../shared/forms/cd-validators'; -import { NotificationService } from '../../../shared/services/notification.service'; +import { RgwBucketService } from '~/app/shared/api/rgw-bucket.service'; +import { RgwSiteService } from '~/app/shared/api/rgw-site.service'; +import { RgwUserService } from '~/app/shared/api/rgw-user.service'; +import { ActionLabelsI18n, URLVerbs } from '~/app/shared/constants/app.constants'; +import { Icons } from '~/app/shared/enum/icons.enum'; +import { NotificationType } from '~/app/shared/enum/notification-type.enum'; +import { CdForm } from '~/app/shared/forms/cd-form'; +import { CdFormBuilder } from '~/app/shared/forms/cd-form-builder'; +import { CdFormGroup } from '~/app/shared/forms/cd-form-group'; +import { CdValidators } from '~/app/shared/forms/cd-validators'; +import { NotificationService } from '~/app/shared/services/notification.service'; import { RgwBucketMfaDelete } from '../models/rgw-bucket-mfa-delete'; import { RgwBucketVersioning } from '../models/rgw-bucket-versioning'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-list/rgw-bucket-list.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-list/rgw-bucket-list.component.spec.ts index a41ff3c169d..315cd366679 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-list/rgw-bucket-list.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-list/rgw-bucket-list.component.spec.ts @@ -6,10 +6,10 @@ import { RouterTestingModule } from '@angular/router/testing'; import { NgbNavModule } from '@ng-bootstrap/ng-bootstrap'; import { of } from 'rxjs'; -import { configureTestBed, PermissionHelper } from '../../../../testing/unit-test-helper'; -import { RgwBucketService } from '../../../shared/api/rgw-bucket.service'; -import { TableActionsComponent } from '../../../shared/datatable/table-actions/table-actions.component'; -import { SharedModule } from '../../../shared/shared.module'; +import { configureTestBed, PermissionHelper } from '~/testing/unit-test-helper'; +import { RgwBucketService } from '~/app/shared/api/rgw-bucket.service'; +import { TableActionsComponent } from '~/app/shared/datatable/table-actions/table-actions.component'; +import { SharedModule } from '~/app/shared/shared.module'; import { RgwBucketDetailsComponent } from '../rgw-bucket-details/rgw-bucket-details.component'; import { RgwBucketListComponent } from './rgw-bucket-list.component'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-list/rgw-bucket-list.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-list/rgw-bucket-list.component.ts index 5593c324b92..000f6c59d8e 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-list/rgw-bucket-list.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-list/rgw-bucket-list.component.ts @@ -10,23 +10,23 @@ import { import _ from 'lodash'; import { forkJoin as observableForkJoin, Observable, Subscriber } from 'rxjs'; -import { RgwBucketService } from '../../../shared/api/rgw-bucket.service'; -import { ListWithDetails } from '../../../shared/classes/list-with-details.class'; -import { TableStatus } from '../../../shared/classes/table-status'; -import { CriticalConfirmationModalComponent } from '../../../shared/components/critical-confirmation-modal/critical-confirmation-modal.component'; -import { ActionLabelsI18n } from '../../../shared/constants/app.constants'; -import { TableComponent } from '../../../shared/datatable/table/table.component'; -import { Icons } from '../../../shared/enum/icons.enum'; -import { CdTableAction } from '../../../shared/models/cd-table-action'; -import { CdTableColumn } from '../../../shared/models/cd-table-column'; -import { CdTableFetchDataContext } from '../../../shared/models/cd-table-fetch-data-context'; -import { CdTableSelection } from '../../../shared/models/cd-table-selection'; -import { Permission } from '../../../shared/models/permissions'; -import { DimlessBinaryPipe } from '../../../shared/pipes/dimless-binary.pipe'; -import { DimlessPipe } from '../../../shared/pipes/dimless.pipe'; -import { AuthStorageService } from '../../../shared/services/auth-storage.service'; -import { ModalService } from '../../../shared/services/modal.service'; -import { URLBuilderService } from '../../../shared/services/url-builder.service'; +import { RgwBucketService } from '~/app/shared/api/rgw-bucket.service'; +import { ListWithDetails } from '~/app/shared/classes/list-with-details.class'; +import { TableStatus } from '~/app/shared/classes/table-status'; +import { CriticalConfirmationModalComponent } from '~/app/shared/components/critical-confirmation-modal/critical-confirmation-modal.component'; +import { ActionLabelsI18n } from '~/app/shared/constants/app.constants'; +import { TableComponent } from '~/app/shared/datatable/table/table.component'; +import { Icons } from '~/app/shared/enum/icons.enum'; +import { CdTableAction } from '~/app/shared/models/cd-table-action'; +import { CdTableColumn } from '~/app/shared/models/cd-table-column'; +import { CdTableFetchDataContext } from '~/app/shared/models/cd-table-fetch-data-context'; +import { CdTableSelection } from '~/app/shared/models/cd-table-selection'; +import { Permission } from '~/app/shared/models/permissions'; +import { DimlessBinaryPipe } from '~/app/shared/pipes/dimless-binary.pipe'; +import { DimlessPipe } from '~/app/shared/pipes/dimless.pipe'; +import { AuthStorageService } from '~/app/shared/services/auth-storage.service'; +import { ModalService } from '~/app/shared/services/modal.service'; +import { URLBuilderService } from '~/app/shared/services/url-builder.service'; const BASE_URL = 'rgw/bucket'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-daemon-details/rgw-daemon-details.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-daemon-details/rgw-daemon-details.component.spec.ts index 3d2709cdfc1..9a9b27cfd8c 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-daemon-details/rgw-daemon-details.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-daemon-details/rgw-daemon-details.component.spec.ts @@ -3,9 +3,9 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { NgbNavModule } from '@ng-bootstrap/ng-bootstrap'; -import { configureTestBed } from '../../../../testing/unit-test-helper'; -import { SharedModule } from '../../../shared/shared.module'; -import { PerformanceCounterModule } from '../../performance-counter/performance-counter.module'; +import { configureTestBed } from '~/testing/unit-test-helper'; +import { SharedModule } from '~/app/shared/shared.module'; +import { PerformanceCounterModule } from '~/app/ceph/performance-counter/performance-counter.module'; import { RgwDaemonDetailsComponent } from './rgw-daemon-details.component'; describe('RgwDaemonDetailsComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-daemon-details/rgw-daemon-details.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-daemon-details/rgw-daemon-details.component.ts index eba47aa722b..06f6c19768f 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-daemon-details/rgw-daemon-details.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-daemon-details/rgw-daemon-details.component.ts @@ -2,9 +2,9 @@ import { Component, Input, OnChanges } from '@angular/core'; import _ from 'lodash'; -import { RgwDaemonService } from '../../../shared/api/rgw-daemon.service'; -import { Permission } from '../../../shared/models/permissions'; -import { AuthStorageService } from '../../../shared/services/auth-storage.service'; +import { RgwDaemonService } from '~/app/shared/api/rgw-daemon.service'; +import { Permission } from '~/app/shared/models/permissions'; +import { AuthStorageService } from '~/app/shared/services/auth-storage.service'; @Component({ selector: 'cd-rgw-daemon-details', diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-daemon-list/rgw-daemon-list.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-daemon-list/rgw-daemon-list.component.spec.ts index 4ee44b72922..84ab84c1146 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-daemon-list/rgw-daemon-list.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-daemon-list/rgw-daemon-list.component.spec.ts @@ -6,12 +6,12 @@ import { RouterTestingModule } from '@angular/router/testing'; import { NgbNavModule } from '@ng-bootstrap/ng-bootstrap'; import { of } from 'rxjs'; -import { configureTestBed, TabHelper } from '../../../../testing/unit-test-helper'; -import { RgwSiteService } from '../../../shared/api/rgw-site.service'; -import { Permissions } from '../../../shared/models/permissions'; -import { AuthStorageService } from '../../../shared/services/auth-storage.service'; -import { SharedModule } from '../../../shared/shared.module'; -import { PerformanceCounterModule } from '../../performance-counter/performance-counter.module'; +import { configureTestBed, TabHelper } from '~/testing/unit-test-helper'; +import { RgwSiteService } from '~/app/shared/api/rgw-site.service'; +import { Permissions } from '~/app/shared/models/permissions'; +import { AuthStorageService } from '~/app/shared/services/auth-storage.service'; +import { SharedModule } from '~/app/shared/shared.module'; +import { PerformanceCounterModule } from '~/app/ceph/performance-counter/performance-counter.module'; import { RgwDaemonDetailsComponent } from '../rgw-daemon-details/rgw-daemon-details.component'; import { RgwDaemonListComponent } from './rgw-daemon-list.component'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-daemon-list/rgw-daemon-list.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-daemon-list/rgw-daemon-list.component.ts index 8d8be533a2d..146d5dbf881 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-daemon-list/rgw-daemon-list.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-daemon-list/rgw-daemon-list.component.ts @@ -1,13 +1,13 @@ import { Component, OnInit } from '@angular/core'; -import { RgwDaemonService } from '../../../shared/api/rgw-daemon.service'; -import { RgwSiteService } from '../../../shared/api/rgw-site.service'; -import { ListWithDetails } from '../../../shared/classes/list-with-details.class'; -import { CdTableColumn } from '../../../shared/models/cd-table-column'; -import { CdTableFetchDataContext } from '../../../shared/models/cd-table-fetch-data-context'; -import { Permission } from '../../../shared/models/permissions'; -import { CephShortVersionPipe } from '../../../shared/pipes/ceph-short-version.pipe'; -import { AuthStorageService } from '../../../shared/services/auth-storage.service'; +import { RgwDaemonService } from '~/app/shared/api/rgw-daemon.service'; +import { RgwSiteService } from '~/app/shared/api/rgw-site.service'; +import { ListWithDetails } from '~/app/shared/classes/list-with-details.class'; +import { CdTableColumn } from '~/app/shared/models/cd-table-column'; +import { CdTableFetchDataContext } from '~/app/shared/models/cd-table-fetch-data-context'; +import { Permission } from '~/app/shared/models/permissions'; +import { CephShortVersionPipe } from '~/app/shared/pipes/ceph-short-version.pipe'; +import { AuthStorageService } from '~/app/shared/services/auth-storage.service'; @Component({ selector: 'cd-rgw-daemon-list', diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-capability-modal/rgw-user-capability-modal.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-capability-modal/rgw-user-capability-modal.component.spec.ts index 3b92991f3d3..009d2413263 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-capability-modal/rgw-user-capability-modal.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-capability-modal/rgw-user-capability-modal.component.spec.ts @@ -4,8 +4,8 @@ import { RouterTestingModule } from '@angular/router/testing'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; -import { configureTestBed } from '../../../../testing/unit-test-helper'; -import { SharedModule } from '../../../shared/shared.module'; +import { configureTestBed } from '~/testing/unit-test-helper'; +import { SharedModule } from '~/app/shared/shared.module'; import { RgwUserCapabilityModalComponent } from './rgw-user-capability-modal.component'; describe('RgwUserCapabilityModalComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-capability-modal/rgw-user-capability-modal.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-capability-modal/rgw-user-capability-modal.component.ts index bc1e5a449f9..3a3c9ac4659 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-capability-modal/rgw-user-capability-modal.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-capability-modal/rgw-user-capability-modal.component.ts @@ -4,9 +4,9 @@ import { Validators } from '@angular/forms'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import _ from 'lodash'; -import { ActionLabelsI18n } from '../../../shared/constants/app.constants'; -import { CdFormBuilder } from '../../../shared/forms/cd-form-builder'; -import { CdFormGroup } from '../../../shared/forms/cd-form-group'; +import { ActionLabelsI18n } from '~/app/shared/constants/app.constants'; +import { CdFormBuilder } from '~/app/shared/forms/cd-form-builder'; +import { CdFormGroup } from '~/app/shared/forms/cd-form-group'; import { RgwUserCapabilities } from '../models/rgw-user-capabilities'; import { RgwUserCapability } from '../models/rgw-user-capability'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-details/rgw-user-details.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-details/rgw-user-details.component.spec.ts index 4156a4ada20..05293f819b4 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-details/rgw-user-details.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-details/rgw-user-details.component.spec.ts @@ -4,8 +4,8 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { NgbNavModule } from '@ng-bootstrap/ng-bootstrap'; -import { configureTestBed, TabHelper } from '../../../../testing/unit-test-helper'; -import { SharedModule } from '../../../shared/shared.module'; +import { configureTestBed, TabHelper } from '~/testing/unit-test-helper'; +import { SharedModule } from '~/app/shared/shared.module'; import { RgwUserS3Key } from '../models/rgw-user-s3-key'; import { RgwUserDetailsComponent } from './rgw-user-details.component'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-details/rgw-user-details.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-details/rgw-user-details.component.ts index 7a2d998a861..2c4a926120b 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-details/rgw-user-details.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-details/rgw-user-details.component.ts @@ -2,11 +2,11 @@ import { Component, Input, OnChanges, OnInit, TemplateRef, ViewChild } from '@an import _ from 'lodash'; -import { RgwUserService } from '../../../shared/api/rgw-user.service'; -import { Icons } from '../../../shared/enum/icons.enum'; -import { CdTableColumn } from '../../../shared/models/cd-table-column'; -import { CdTableSelection } from '../../../shared/models/cd-table-selection'; -import { ModalService } from '../../../shared/services/modal.service'; +import { RgwUserService } from '~/app/shared/api/rgw-user.service'; +import { Icons } from '~/app/shared/enum/icons.enum'; +import { CdTableColumn } from '~/app/shared/models/cd-table-column'; +import { CdTableSelection } from '~/app/shared/models/cd-table-selection'; +import { ModalService } from '~/app/shared/services/modal.service'; import { RgwUserS3Key } from '../models/rgw-user-s3-key'; import { RgwUserSwiftKey } from '../models/rgw-user-swift-key'; import { RgwUserS3KeyModalComponent } from '../rgw-user-s3-key-modal/rgw-user-s3-key-modal.component'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-form/rgw-user-form.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-form/rgw-user-form.component.spec.ts index f434aae26a5..2840edcdbc4 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-form/rgw-user-form.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-form/rgw-user-form.component.spec.ts @@ -8,11 +8,11 @@ import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap'; import { ToastrModule } from 'ngx-toastr'; import { of as observableOf } from 'rxjs'; -import { configureTestBed, FormHelper } from '../../../../testing/unit-test-helper'; -import { RgwUserService } from '../../../shared/api/rgw-user.service'; -import { NotificationType } from '../../../shared/enum/notification-type.enum'; -import { NotificationService } from '../../../shared/services/notification.service'; -import { SharedModule } from '../../../shared/shared.module'; +import { configureTestBed, FormHelper } from '~/testing/unit-test-helper'; +import { RgwUserService } from '~/app/shared/api/rgw-user.service'; +import { NotificationType } from '~/app/shared/enum/notification-type.enum'; +import { NotificationService } from '~/app/shared/services/notification.service'; +import { SharedModule } from '~/app/shared/shared.module'; import { RgwUserCapabilities } from '../models/rgw-user-capabilities'; import { RgwUserCapability } from '../models/rgw-user-capability'; import { RgwUserS3Key } from '../models/rgw-user-s3-key'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-form/rgw-user-form.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-form/rgw-user-form.component.ts index 1aceb55f274..5fbbb9face9 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-form/rgw-user-form.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-form/rgw-user-form.component.ts @@ -5,17 +5,17 @@ import { ActivatedRoute, Router } from '@angular/router'; import _ from 'lodash'; import { concat as observableConcat, forkJoin as observableForkJoin, Observable } from 'rxjs'; -import { RgwUserService } from '../../../shared/api/rgw-user.service'; -import { ActionLabelsI18n, URLVerbs } from '../../../shared/constants/app.constants'; -import { Icons } from '../../../shared/enum/icons.enum'; -import { NotificationType } from '../../../shared/enum/notification-type.enum'; -import { CdForm } from '../../../shared/forms/cd-form'; -import { CdFormBuilder } from '../../../shared/forms/cd-form-builder'; -import { CdFormGroup } from '../../../shared/forms/cd-form-group'; -import { CdValidators, isEmptyInputValue } from '../../../shared/forms/cd-validators'; -import { FormatterService } from '../../../shared/services/formatter.service'; -import { ModalService } from '../../../shared/services/modal.service'; -import { NotificationService } from '../../../shared/services/notification.service'; +import { RgwUserService } from '~/app/shared/api/rgw-user.service'; +import { ActionLabelsI18n, URLVerbs } from '~/app/shared/constants/app.constants'; +import { Icons } from '~/app/shared/enum/icons.enum'; +import { NotificationType } from '~/app/shared/enum/notification-type.enum'; +import { CdForm } from '~/app/shared/forms/cd-form'; +import { CdFormBuilder } from '~/app/shared/forms/cd-form-builder'; +import { CdFormGroup } from '~/app/shared/forms/cd-form-group'; +import { CdValidators, isEmptyInputValue } from '~/app/shared/forms/cd-validators'; +import { FormatterService } from '~/app/shared/services/formatter.service'; +import { ModalService } from '~/app/shared/services/modal.service'; +import { NotificationService } from '~/app/shared/services/notification.service'; import { RgwUserCapabilities } from '../models/rgw-user-capabilities'; import { RgwUserCapability } from '../models/rgw-user-capability'; import { RgwUserS3Key } from '../models/rgw-user-s3-key'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-list/rgw-user-list.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-list/rgw-user-list.component.spec.ts index c037065e03c..b409fc60018 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-list/rgw-user-list.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-list/rgw-user-list.component.spec.ts @@ -4,9 +4,9 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { RouterTestingModule } from '@angular/router/testing'; -import { configureTestBed, PermissionHelper } from '../../../../testing/unit-test-helper'; -import { TableActionsComponent } from '../../../shared/datatable/table-actions/table-actions.component'; -import { SharedModule } from '../../../shared/shared.module'; +import { configureTestBed, PermissionHelper } from '~/testing/unit-test-helper'; +import { TableActionsComponent } from '~/app/shared/datatable/table-actions/table-actions.component'; +import { SharedModule } from '~/app/shared/shared.module'; import { RgwUserListComponent } from './rgw-user-list.component'; describe('RgwUserListComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-list/rgw-user-list.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-list/rgw-user-list.component.ts index 7dd344c7ca6..fc70ebc1495 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-list/rgw-user-list.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-list/rgw-user-list.component.ts @@ -2,22 +2,22 @@ import { Component, NgZone, ViewChild } from '@angular/core'; import { forkJoin as observableForkJoin, Observable, Subscriber } from 'rxjs'; -import { RgwUserService } from '../../../shared/api/rgw-user.service'; -import { ListWithDetails } from '../../../shared/classes/list-with-details.class'; -import { TableStatus } from '../../../shared/classes/table-status'; -import { CriticalConfirmationModalComponent } from '../../../shared/components/critical-confirmation-modal/critical-confirmation-modal.component'; -import { ActionLabelsI18n } from '../../../shared/constants/app.constants'; -import { TableComponent } from '../../../shared/datatable/table/table.component'; -import { CellTemplate } from '../../../shared/enum/cell-template.enum'; -import { Icons } from '../../../shared/enum/icons.enum'; -import { CdTableAction } from '../../../shared/models/cd-table-action'; -import { CdTableColumn } from '../../../shared/models/cd-table-column'; -import { CdTableFetchDataContext } from '../../../shared/models/cd-table-fetch-data-context'; -import { CdTableSelection } from '../../../shared/models/cd-table-selection'; -import { Permission } from '../../../shared/models/permissions'; -import { AuthStorageService } from '../../../shared/services/auth-storage.service'; -import { ModalService } from '../../../shared/services/modal.service'; -import { URLBuilderService } from '../../../shared/services/url-builder.service'; +import { RgwUserService } from '~/app/shared/api/rgw-user.service'; +import { ListWithDetails } from '~/app/shared/classes/list-with-details.class'; +import { TableStatus } from '~/app/shared/classes/table-status'; +import { CriticalConfirmationModalComponent } from '~/app/shared/components/critical-confirmation-modal/critical-confirmation-modal.component'; +import { ActionLabelsI18n } from '~/app/shared/constants/app.constants'; +import { TableComponent } from '~/app/shared/datatable/table/table.component'; +import { CellTemplate } from '~/app/shared/enum/cell-template.enum'; +import { Icons } from '~/app/shared/enum/icons.enum'; +import { CdTableAction } from '~/app/shared/models/cd-table-action'; +import { CdTableColumn } from '~/app/shared/models/cd-table-column'; +import { CdTableFetchDataContext } from '~/app/shared/models/cd-table-fetch-data-context'; +import { CdTableSelection } from '~/app/shared/models/cd-table-selection'; +import { Permission } from '~/app/shared/models/permissions'; +import { AuthStorageService } from '~/app/shared/services/auth-storage.service'; +import { ModalService } from '~/app/shared/services/modal.service'; +import { URLBuilderService } from '~/app/shared/services/url-builder.service'; const BASE_URL = 'rgw/user'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-s3-key-modal/rgw-user-s3-key-modal.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-s3-key-modal/rgw-user-s3-key-modal.component.spec.ts index 9c42e1c6d29..989825fd724 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-s3-key-modal/rgw-user-s3-key-modal.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-s3-key-modal/rgw-user-s3-key-modal.component.spec.ts @@ -4,8 +4,8 @@ import { RouterTestingModule } from '@angular/router/testing'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; -import { configureTestBed } from '../../../../testing/unit-test-helper'; -import { SharedModule } from '../../../shared/shared.module'; +import { configureTestBed } from '~/testing/unit-test-helper'; +import { SharedModule } from '~/app/shared/shared.module'; import { RgwUserS3KeyModalComponent } from './rgw-user-s3-key-modal.component'; describe('RgwUserS3KeyModalComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-s3-key-modal/rgw-user-s3-key-modal.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-s3-key-modal/rgw-user-s3-key-modal.component.ts index c1323c5f045..23566e87c44 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-s3-key-modal/rgw-user-s3-key-modal.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-s3-key-modal/rgw-user-s3-key-modal.component.ts @@ -4,10 +4,10 @@ import { Validators } from '@angular/forms'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import _ from 'lodash'; -import { ActionLabelsI18n } from '../../../shared/constants/app.constants'; -import { CdFormBuilder } from '../../../shared/forms/cd-form-builder'; -import { CdFormGroup } from '../../../shared/forms/cd-form-group'; -import { CdValidators } from '../../../shared/forms/cd-validators'; +import { ActionLabelsI18n } from '~/app/shared/constants/app.constants'; +import { CdFormBuilder } from '~/app/shared/forms/cd-form-builder'; +import { CdFormGroup } from '~/app/shared/forms/cd-form-group'; +import { CdValidators } from '~/app/shared/forms/cd-validators'; import { RgwUserS3Key } from '../models/rgw-user-s3-key'; @Component({ diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-subuser-modal/rgw-user-subuser-modal.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-subuser-modal/rgw-user-subuser-modal.component.spec.ts index 4ebe26a298d..5a28bb5b8ac 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-subuser-modal/rgw-user-subuser-modal.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-subuser-modal/rgw-user-subuser-modal.component.spec.ts @@ -4,8 +4,8 @@ import { RouterTestingModule } from '@angular/router/testing'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; -import { configureTestBed } from '../../../../testing/unit-test-helper'; -import { SharedModule } from '../../../shared/shared.module'; +import { configureTestBed } from '~/testing/unit-test-helper'; +import { SharedModule } from '~/app/shared/shared.module'; import { RgwUserSubuserModalComponent } from './rgw-user-subuser-modal.component'; describe('RgwUserSubuserModalComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-subuser-modal/rgw-user-subuser-modal.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-subuser-modal/rgw-user-subuser-modal.component.ts index b7b239b62a1..32aef91fea4 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-subuser-modal/rgw-user-subuser-modal.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-subuser-modal/rgw-user-subuser-modal.component.ts @@ -4,10 +4,10 @@ import { AbstractControl, ValidationErrors, ValidatorFn, Validators } from '@ang import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import _ from 'lodash'; -import { ActionLabelsI18n } from '../../../shared/constants/app.constants'; -import { CdFormBuilder } from '../../../shared/forms/cd-form-builder'; -import { CdFormGroup } from '../../../shared/forms/cd-form-group'; -import { CdValidators, isEmptyInputValue } from '../../../shared/forms/cd-validators'; +import { ActionLabelsI18n } from '~/app/shared/constants/app.constants'; +import { CdFormBuilder } from '~/app/shared/forms/cd-form-builder'; +import { CdFormGroup } from '~/app/shared/forms/cd-form-group'; +import { CdValidators, isEmptyInputValue } from '~/app/shared/forms/cd-validators'; import { RgwUserSubuser } from '../models/rgw-user-subuser'; @Component({ diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-swift-key-modal/rgw-user-swift-key-modal.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-swift-key-modal/rgw-user-swift-key-modal.component.spec.ts index 4d5e8fc4176..0b7fa2f0d13 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-swift-key-modal/rgw-user-swift-key-modal.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-swift-key-modal/rgw-user-swift-key-modal.component.spec.ts @@ -5,8 +5,8 @@ import { RouterTestingModule } from '@angular/router/testing'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { ToastrModule } from 'ngx-toastr'; -import { configureTestBed } from '../../../../testing/unit-test-helper'; -import { SharedModule } from '../../../shared/shared.module'; +import { configureTestBed } from '~/testing/unit-test-helper'; +import { SharedModule } from '~/app/shared/shared.module'; import { RgwUserSwiftKeyModalComponent } from './rgw-user-swift-key-modal.component'; describe('RgwUserSwiftKeyModalComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-swift-key-modal/rgw-user-swift-key-modal.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-swift-key-modal/rgw-user-swift-key-modal.component.ts index 306e81be81f..7bd63bcc02b 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-swift-key-modal/rgw-user-swift-key-modal.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-swift-key-modal/rgw-user-swift-key-modal.component.ts @@ -2,7 +2,7 @@ import { Component } from '@angular/core'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; -import { ActionLabelsI18n } from '../../../shared/constants/app.constants'; +import { ActionLabelsI18n } from '~/app/shared/constants/app.constants'; @Component({ selector: 'cd-rgw-user-swift-key-modal', diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw.module.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw.module.ts index 9afd2b124e3..02f53923028 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw.module.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw.module.ts @@ -5,9 +5,9 @@ import { RouterModule, Routes } from '@angular/router'; import { NgbNavModule, NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap'; -import { ActionLabels, URLVerbs } from '../../shared/constants/app.constants'; -import { AuthGuardService } from '../../shared/services/auth-guard.service'; -import { SharedModule } from '../../shared/shared.module'; +import { ActionLabels, URLVerbs } from '~/app/shared/constants/app.constants'; +import { AuthGuardService } from '~/app/shared/services/auth-guard.service'; +import { SharedModule } from '~/app/shared/shared.module'; import { PerformanceCounterModule } from '../performance-counter/performance-counter.module'; import { Rgw501Component } from './rgw-501/rgw-501.component'; import { RgwBucketDetailsComponent } from './rgw-bucket-details/rgw-bucket-details.component'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/shared/ceph-shared.module.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/shared/ceph-shared.module.ts index 2ca947a6120..010bc573ea5 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/shared/ceph-shared.module.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/shared/ceph-shared.module.ts @@ -3,8 +3,8 @@ import { NgModule } from '@angular/core'; import { NgbNavModule } from '@ng-bootstrap/ng-bootstrap'; -import { DataTableModule } from '../../shared/datatable/datatable.module'; -import { SharedModule } from '../../shared/shared.module'; +import { DataTableModule } from '~/app/shared/datatable/datatable.module'; +import { SharedModule } from '~/app/shared/shared.module'; import { DeviceListComponent } from './device-list/device-list.component'; import { SmartListComponent } from './smart-list/smart-list.component'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/shared/device-list/device-list.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/shared/device-list/device-list.component.spec.ts index 37518b18693..256aebfc036 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/shared/device-list/device-list.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/shared/device-list/device-list.component.spec.ts @@ -1,8 +1,8 @@ import { HttpClientTestingModule } from '@angular/common/http/testing'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { configureTestBed } from '../../../../testing/unit-test-helper'; -import { SharedModule } from '../../../shared/shared.module'; +import { configureTestBed } from '~/testing/unit-test-helper'; +import { SharedModule } from '~/app/shared/shared.module'; import { DeviceListComponent } from './device-list.component'; describe('DeviceListComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/shared/device-list/device-list.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/shared/device-list/device-list.component.ts index 22ce27ff673..5503d1319eb 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/shared/device-list/device-list.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/shared/device-list/device-list.component.ts @@ -1,11 +1,11 @@ import { DatePipe } from '@angular/common'; import { Component, Input, OnChanges, OnInit, TemplateRef, ViewChild } from '@angular/core'; -import { HostService } from '../../../shared/api/host.service'; -import { OsdService } from '../../../shared/api/osd.service'; -import { CellTemplate } from '../../../shared/enum/cell-template.enum'; -import { CdTableColumn } from '../../../shared/models/cd-table-column'; -import { CdDevice } from '../../../shared/models/devices'; +import { HostService } from '~/app/shared/api/host.service'; +import { OsdService } from '~/app/shared/api/osd.service'; +import { CellTemplate } from '~/app/shared/enum/cell-template.enum'; +import { CdTableColumn } from '~/app/shared/models/cd-table-column'; +import { CdDevice } from '~/app/shared/models/devices'; @Component({ selector: 'cd-device-list', diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/shared/pg-category.service.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/shared/pg-category.service.spec.ts index 4bd5ef179e8..302c3e202c6 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/shared/pg-category.service.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/shared/pg-category.service.spec.ts @@ -1,6 +1,6 @@ import { TestBed } from '@angular/core/testing'; -import { configureTestBed } from '../../../testing/unit-test-helper'; +import { configureTestBed } from '~/testing/unit-test-helper'; import { PgCategory } from './pg-category.model'; import { PgCategoryService } from './pg-category.service'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/shared/smart-list/smart-list.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/shared/smart-list/smart-list.component.spec.ts index 6ee1af02e45..5f9bfab6d7a 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/shared/smart-list/smart-list.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/shared/smart-list/smart-list.component.spec.ts @@ -8,10 +8,10 @@ import { NgbNavModule } from '@ng-bootstrap/ng-bootstrap'; import _ from 'lodash'; import { of } from 'rxjs'; -import { configureTestBed } from '../../../../testing/unit-test-helper'; -import { OsdService } from '../../../shared/api/osd.service'; -import { HddSmartDataV1, NvmeSmartDataV1, SmartDataResult } from '../../../shared/models/smart'; -import { SharedModule } from '../../../shared/shared.module'; +import { configureTestBed } from '~/testing/unit-test-helper'; +import { OsdService } from '~/app/shared/api/osd.service'; +import { HddSmartDataV1, NvmeSmartDataV1, SmartDataResult } from '~/app/shared/models/smart'; +import { SharedModule } from '~/app/shared/shared.module'; import { SmartListComponent } from './smart-list.component'; describe('OsdSmartListComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/shared/smart-list/smart-list.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/shared/smart-list/smart-list.component.ts index e9cab7e9c4d..8b3790e43a5 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/shared/smart-list/smart-list.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/shared/smart-list/smart-list.component.ts @@ -3,16 +3,16 @@ import { Component, Input, OnChanges, OnInit, SimpleChanges, ViewChild } from '@ import { NgbNav } from '@ng-bootstrap/ng-bootstrap'; import _ from 'lodash'; -import { HostService } from '../../../shared/api/host.service'; -import { OsdService } from '../../../shared/api/osd.service'; -import { CdTableColumn } from '../../../shared/models/cd-table-column'; +import { HostService } from '~/app/shared/api/host.service'; +import { OsdService } from '~/app/shared/api/osd.service'; +import { CdTableColumn } from '~/app/shared/models/cd-table-column'; import { HddSmartDataV1, NvmeSmartDataV1, SmartDataResult, SmartError, SmartErrorResult -} from '../../../shared/models/smart'; +} from '~/app/shared/models/smart'; @Component({ selector: 'cd-smart-list', diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/auth/auth.module.ts b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/auth.module.ts index 55c36607759..dc17a215bfc 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/core/auth/auth.module.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/auth.module.ts @@ -5,8 +5,8 @@ import { RouterModule, Routes } from '@angular/router'; import { NgbNavModule, NgbPopoverModule } from '@ng-bootstrap/ng-bootstrap'; -import { ActionLabels, URLVerbs } from '../../shared/constants/app.constants'; -import { SharedModule } from '../../shared/shared.module'; +import { ActionLabels, URLVerbs } from '~/app/shared/constants/app.constants'; +import { SharedModule } from '~/app/shared/shared.module'; import { LoginPasswordFormComponent } from './login-password-form/login-password-form.component'; import { LoginComponent } from './login/login.component'; import { RoleDetailsComponent } from './role-details/role-details.component'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/auth/login-password-form/login-password-form.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/login-password-form/login-password-form.component.spec.ts index 36bef19ef88..37cca0777d7 100755 --- a/src/pybind/mgr/dashboard/frontend/src/app/core/auth/login-password-form/login-password-form.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/login-password-form/login-password-form.component.spec.ts @@ -6,12 +6,12 @@ import { RouterTestingModule } from '@angular/router/testing'; import { ToastrModule } from 'ngx-toastr'; -import { configureTestBed, FormHelper } from '../../../../testing/unit-test-helper'; -import { AuthService } from '../../../shared/api/auth.service'; -import { ComponentsModule } from '../../../shared/components/components.module'; -import { CdFormGroup } from '../../../shared/forms/cd-form-group'; -import { AuthStorageService } from '../../../shared/services/auth-storage.service'; -import { SharedModule } from '../../../shared/shared.module'; +import { configureTestBed, FormHelper } from '~/testing/unit-test-helper'; +import { AuthService } from '~/app/shared/api/auth.service'; +import { ComponentsModule } from '~/app/shared/components/components.module'; +import { CdFormGroup } from '~/app/shared/forms/cd-form-group'; +import { AuthStorageService } from '~/app/shared/services/auth-storage.service'; +import { SharedModule } from '~/app/shared/shared.module'; import { LoginPasswordFormComponent } from './login-password-form.component'; describe('LoginPasswordFormComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/auth/login-password-form/login-password-form.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/login-password-form/login-password-form.component.ts index 1119d330771..0e72cca35a8 100755 --- a/src/pybind/mgr/dashboard/frontend/src/app/core/auth/login-password-form/login-password-form.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/login-password-form/login-password-form.component.ts @@ -1,13 +1,13 @@ import { Component } from '@angular/core'; import { Router } from '@angular/router'; -import { AuthService } from '../../../shared/api/auth.service'; -import { UserService } from '../../../shared/api/user.service'; -import { ActionLabelsI18n } from '../../../shared/constants/app.constants'; -import { CdFormBuilder } from '../../../shared/forms/cd-form-builder'; -import { AuthStorageService } from '../../../shared/services/auth-storage.service'; -import { NotificationService } from '../../../shared/services/notification.service'; -import { PasswordPolicyService } from '../../../shared/services/password-policy.service'; +import { AuthService } from '~/app/shared/api/auth.service'; +import { UserService } from '~/app/shared/api/user.service'; +import { ActionLabelsI18n } from '~/app/shared/constants/app.constants'; +import { CdFormBuilder } from '~/app/shared/forms/cd-form-builder'; +import { AuthStorageService } from '~/app/shared/services/auth-storage.service'; +import { NotificationService } from '~/app/shared/services/notification.service'; +import { PasswordPolicyService } from '~/app/shared/services/password-policy.service'; import { UserPasswordFormComponent } from '../user-password-form/user-password-form.component'; @Component({ diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/auth/login/login.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/login/login.component.spec.ts index e162d3721dc..15a7275739f 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/core/auth/login/login.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/login/login.component.spec.ts @@ -2,7 +2,7 @@ import { HttpClientTestingModule } from '@angular/common/http/testing'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; -import { configureTestBed } from '../../../../testing/unit-test-helper'; +import { configureTestBed } from '~/testing/unit-test-helper'; import { AuthModule } from '../auth.module'; import { LoginComponent } from './login.component'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/auth/login/login.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/login/login.component.ts index 6fef3212408..749fadd1a01 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/core/auth/login/login.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/login/login.component.ts @@ -3,10 +3,10 @@ import { ActivatedRoute, Router } from '@angular/router'; import _ from 'lodash'; -import { AuthService } from '../../../shared/api/auth.service'; -import { Credentials } from '../../../shared/models/credentials'; -import { AuthStorageService } from '../../../shared/services/auth-storage.service'; -import { ModalService } from '../../../shared/services/modal.service'; +import { AuthService } from '~/app/shared/api/auth.service'; +import { Credentials } from '~/app/shared/models/credentials'; +import { AuthStorageService } from '~/app/shared/services/auth-storage.service'; +import { ModalService } from '~/app/shared/services/modal.service'; @Component({ selector: 'cd-login', diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/auth/role-details/role-details.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/role-details/role-details.component.spec.ts index 1f918bb06fb..43bd3458fc9 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/core/auth/role-details/role-details.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/role-details/role-details.component.spec.ts @@ -4,8 +4,8 @@ import { RouterTestingModule } from '@angular/router/testing'; import { NgbNavModule } from '@ng-bootstrap/ng-bootstrap'; -import { configureTestBed } from '../../../../testing/unit-test-helper'; -import { SharedModule } from '../../../shared/shared.module'; +import { configureTestBed } from '~/testing/unit-test-helper'; +import { SharedModule } from '~/app/shared/shared.module'; import { RoleDetailsComponent } from './role-details.component'; describe('RoleDetailsComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/auth/role-details/role-details.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/role-details/role-details.component.ts index 2479cb736ed..244a7861b27 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/core/auth/role-details/role-details.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/role-details/role-details.component.ts @@ -2,8 +2,8 @@ import { Component, Input, OnChanges, OnInit } from '@angular/core'; import _ from 'lodash'; -import { CellTemplate } from '../../../shared/enum/cell-template.enum'; -import { CdTableColumn } from '../../../shared/models/cd-table-column'; +import { CellTemplate } from '~/app/shared/enum/cell-template.enum'; +import { CdTableColumn } from '~/app/shared/models/cd-table-column'; @Component({ selector: 'cd-role-details', diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/auth/role-form/role-form.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/role-form/role-form.component.spec.ts index cd2109c0293..802a2198f98 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/core/auth/role-form/role-form.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/role-form/role-form.component.spec.ts @@ -8,13 +8,13 @@ import { RouterTestingModule } from '@angular/router/testing'; import { ToastrModule } from 'ngx-toastr'; import { of } from 'rxjs'; -import { configureTestBed, FormHelper } from '../../../../testing/unit-test-helper'; -import { RoleService } from '../../../shared/api/role.service'; -import { ScopeService } from '../../../shared/api/scope.service'; -import { LoadingPanelComponent } from '../../../shared/components/loading-panel/loading-panel.component'; -import { CdFormGroup } from '../../../shared/forms/cd-form-group'; -import { NotificationService } from '../../../shared/services/notification.service'; -import { SharedModule } from '../../../shared/shared.module'; +import { configureTestBed, FormHelper } from '~/testing/unit-test-helper'; +import { RoleService } from '~/app/shared/api/role.service'; +import { ScopeService } from '~/app/shared/api/scope.service'; +import { LoadingPanelComponent } from '~/app/shared/components/loading-panel/loading-panel.component'; +import { CdFormGroup } from '~/app/shared/forms/cd-form-group'; +import { NotificationService } from '~/app/shared/services/notification.service'; +import { SharedModule } from '~/app/shared/shared.module'; import { RoleFormComponent } from './role-form.component'; import { RoleFormModel } from './role-form.model'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/auth/role-form/role-form.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/role-form/role-form.component.ts index 8a455e0ebcd..21dff1c85af 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/core/auth/role-form/role-form.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/role-form/role-form.component.ts @@ -5,15 +5,15 @@ import { ActivatedRoute, Router } from '@angular/router'; import _ from 'lodash'; import { forkJoin as observableForkJoin } from 'rxjs'; -import { RoleService } from '../../../shared/api/role.service'; -import { ScopeService } from '../../../shared/api/scope.service'; -import { ActionLabelsI18n } from '../../../shared/constants/app.constants'; -import { NotificationType } from '../../../shared/enum/notification-type.enum'; -import { CdForm } from '../../../shared/forms/cd-form'; -import { CdFormGroup } from '../../../shared/forms/cd-form-group'; -import { CdValidators } from '../../../shared/forms/cd-validators'; -import { CdTableColumn } from '../../../shared/models/cd-table-column'; -import { NotificationService } from '../../../shared/services/notification.service'; +import { RoleService } from '~/app/shared/api/role.service'; +import { ScopeService } from '~/app/shared/api/scope.service'; +import { ActionLabelsI18n } from '~/app/shared/constants/app.constants'; +import { NotificationType } from '~/app/shared/enum/notification-type.enum'; +import { CdForm } from '~/app/shared/forms/cd-form'; +import { CdFormGroup } from '~/app/shared/forms/cd-form-group'; +import { CdValidators } from '~/app/shared/forms/cd-validators'; +import { CdTableColumn } from '~/app/shared/models/cd-table-column'; +import { NotificationService } from '~/app/shared/services/notification.service'; import { RoleFormMode } from './role-form-mode.enum'; import { RoleFormModel } from './role-form.model'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/auth/role-list/role-list.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/role-list/role-list.component.spec.ts index bc6d1fdfc3c..bdb8c91bda2 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/core/auth/role-list/role-list.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/role-list/role-list.component.spec.ts @@ -6,9 +6,9 @@ import { RouterTestingModule } from '@angular/router/testing'; import { NgbNavModule } from '@ng-bootstrap/ng-bootstrap'; import { ToastrModule } from 'ngx-toastr'; -import { configureTestBed, PermissionHelper } from '../../../../testing/unit-test-helper'; -import { TableActionsComponent } from '../../../shared/datatable/table-actions/table-actions.component'; -import { SharedModule } from '../../../shared/shared.module'; +import { configureTestBed, PermissionHelper } from '~/testing/unit-test-helper'; +import { TableActionsComponent } from '~/app/shared/datatable/table-actions/table-actions.component'; +import { SharedModule } from '~/app/shared/shared.module'; import { RoleDetailsComponent } from '../role-details/role-details.component'; import { UserTabsComponent } from '../user-tabs/user-tabs.component'; import { RoleListComponent } from './role-list.component'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/auth/role-list/role-list.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/role-list/role-list.component.ts index ecf254051fa..83dcd69fa57 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/core/auth/role-list/role-list.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/role-list/role-list.component.ts @@ -3,24 +3,24 @@ import { Component, OnInit } from '@angular/core'; import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; import { forkJoin } from 'rxjs'; -import { RoleService } from '../../../shared/api/role.service'; -import { ScopeService } from '../../../shared/api/scope.service'; -import { ListWithDetails } from '../../../shared/classes/list-with-details.class'; -import { CriticalConfirmationModalComponent } from '../../../shared/components/critical-confirmation-modal/critical-confirmation-modal.component'; -import { FormModalComponent } from '../../../shared/components/form-modal/form-modal.component'; -import { ActionLabelsI18n } from '../../../shared/constants/app.constants'; -import { CellTemplate } from '../../../shared/enum/cell-template.enum'; -import { Icons } from '../../../shared/enum/icons.enum'; -import { NotificationType } from '../../../shared/enum/notification-type.enum'; -import { CdTableAction } from '../../../shared/models/cd-table-action'; -import { CdTableColumn } from '../../../shared/models/cd-table-column'; -import { CdTableSelection } from '../../../shared/models/cd-table-selection'; -import { Permission } from '../../../shared/models/permissions'; -import { EmptyPipe } from '../../../shared/pipes/empty.pipe'; -import { AuthStorageService } from '../../../shared/services/auth-storage.service'; -import { ModalService } from '../../../shared/services/modal.service'; -import { NotificationService } from '../../../shared/services/notification.service'; -import { URLBuilderService } from '../../../shared/services/url-builder.service'; +import { RoleService } from '~/app/shared/api/role.service'; +import { ScopeService } from '~/app/shared/api/scope.service'; +import { ListWithDetails } from '~/app/shared/classes/list-with-details.class'; +import { CriticalConfirmationModalComponent } from '~/app/shared/components/critical-confirmation-modal/critical-confirmation-modal.component'; +import { FormModalComponent } from '~/app/shared/components/form-modal/form-modal.component'; +import { ActionLabelsI18n } from '~/app/shared/constants/app.constants'; +import { CellTemplate } from '~/app/shared/enum/cell-template.enum'; +import { Icons } from '~/app/shared/enum/icons.enum'; +import { NotificationType } from '~/app/shared/enum/notification-type.enum'; +import { CdTableAction } from '~/app/shared/models/cd-table-action'; +import { CdTableColumn } from '~/app/shared/models/cd-table-column'; +import { CdTableSelection } from '~/app/shared/models/cd-table-selection'; +import { Permission } from '~/app/shared/models/permissions'; +import { EmptyPipe } from '~/app/shared/pipes/empty.pipe'; +import { AuthStorageService } from '~/app/shared/services/auth-storage.service'; +import { ModalService } from '~/app/shared/services/modal.service'; +import { NotificationService } from '~/app/shared/services/notification.service'; +import { URLBuilderService } from '~/app/shared/services/url-builder.service'; const BASE_URL = 'user-management/roles'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/auth/sso/sso-not-found/sso-not-found.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/sso/sso-not-found/sso-not-found.component.spec.ts index 528c7b1bae8..6e3cf5dc257 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/core/auth/sso/sso-not-found/sso-not-found.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/sso/sso-not-found/sso-not-found.component.spec.ts @@ -1,6 +1,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { configureTestBed } from '../../../../../testing/unit-test-helper'; +import { configureTestBed } from '~/testing/unit-test-helper'; import { SsoNotFoundComponent } from './sso-not-found.component'; describe('SsoNotFoundComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/auth/user-form/user-form-role.model.ts b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/user-form/user-form-role.model.ts index 93941742265..2d323b04ea5 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/core/auth/user-form/user-form-role.model.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/user-form/user-form-role.model.ts @@ -1,4 +1,4 @@ -import { SelectOption } from '../../../shared/components/select/select-option.model'; +import { SelectOption } from '~/app/shared/components/select/select-option.model'; export class UserFormRoleModel implements SelectOption { name: string; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/auth/user-form/user-form.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/user-form/user-form.component.spec.ts index fb16065527c..c6b3f8d0db4 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/core/auth/user-form/user-form.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/user-form/user-form.component.spec.ts @@ -9,18 +9,18 @@ import { NgbPopoverModule } from '@ng-bootstrap/ng-bootstrap'; import { ToastrModule } from 'ngx-toastr'; import { of } from 'rxjs'; -import { configureTestBed, FormHelper } from '../../../../testing/unit-test-helper'; -import { RoleService } from '../../../shared/api/role.service'; -import { SettingsService } from '../../../shared/api/settings.service'; -import { UserService } from '../../../shared/api/user.service'; -import { ComponentsModule } from '../../../shared/components/components.module'; -import { LoadingPanelComponent } from '../../../shared/components/loading-panel/loading-panel.component'; -import { CdFormGroup } from '../../../shared/forms/cd-form-group'; -import { AuthStorageService } from '../../../shared/services/auth-storage.service'; -import { ModalService } from '../../../shared/services/modal.service'; -import { NotificationService } from '../../../shared/services/notification.service'; -import { SharedModule } from '../../../shared/shared.module'; -import { PasswordPolicyService } from './../../../shared/services/password-policy.service'; +import { configureTestBed, FormHelper } from '~/testing/unit-test-helper'; +import { RoleService } from '~/app/shared/api/role.service'; +import { SettingsService } from '~/app/shared/api/settings.service'; +import { UserService } from '~/app/shared/api/user.service'; +import { ComponentsModule } from '~/app/shared/components/components.module'; +import { LoadingPanelComponent } from '~/app/shared/components/loading-panel/loading-panel.component'; +import { CdFormGroup } from '~/app/shared/forms/cd-form-group'; +import { AuthStorageService } from '~/app/shared/services/auth-storage.service'; +import { ModalService } from '~/app/shared/services/modal.service'; +import { NotificationService } from '~/app/shared/services/notification.service'; +import { SharedModule } from '~/app/shared/shared.module'; +import { PasswordPolicyService } from '~/app/shared/services/password-policy.service'; import { UserFormComponent } from './user-form.component'; import { UserFormModel } from './user-form.model'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/auth/user-form/user-form.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/user-form/user-form.component.ts index 627766ac2fe..1a0ddf35cc9 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/core/auth/user-form/user-form.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/user-form/user-form.component.ts @@ -7,24 +7,24 @@ import _ from 'lodash'; import moment from 'moment'; import { forkJoin as observableForkJoin } from 'rxjs'; -import { AuthService } from '../../../shared/api/auth.service'; -import { RoleService } from '../../../shared/api/role.service'; -import { SettingsService } from '../../../shared/api/settings.service'; -import { UserService } from '../../../shared/api/user.service'; -import { ConfirmationModalComponent } from '../../../shared/components/confirmation-modal/confirmation-modal.component'; -import { SelectMessages } from '../../../shared/components/select/select-messages.model'; -import { ActionLabelsI18n } from '../../../shared/constants/app.constants'; -import { Icons } from '../../../shared/enum/icons.enum'; -import { NotificationType } from '../../../shared/enum/notification-type.enum'; -import { CdForm } from '../../../shared/forms/cd-form'; -import { CdFormBuilder } from '../../../shared/forms/cd-form-builder'; -import { CdFormGroup } from '../../../shared/forms/cd-form-group'; -import { CdValidators } from '../../../shared/forms/cd-validators'; -import { CdPwdExpirationSettings } from '../../../shared/models/cd-pwd-expiration-settings'; -import { AuthStorageService } from '../../../shared/services/auth-storage.service'; -import { ModalService } from '../../../shared/services/modal.service'; -import { NotificationService } from '../../../shared/services/notification.service'; -import { PasswordPolicyService } from '../../../shared/services/password-policy.service'; +import { AuthService } from '~/app/shared/api/auth.service'; +import { RoleService } from '~/app/shared/api/role.service'; +import { SettingsService } from '~/app/shared/api/settings.service'; +import { UserService } from '~/app/shared/api/user.service'; +import { ConfirmationModalComponent } from '~/app/shared/components/confirmation-modal/confirmation-modal.component'; +import { SelectMessages } from '~/app/shared/components/select/select-messages.model'; +import { ActionLabelsI18n } from '~/app/shared/constants/app.constants'; +import { Icons } from '~/app/shared/enum/icons.enum'; +import { NotificationType } from '~/app/shared/enum/notification-type.enum'; +import { CdForm } from '~/app/shared/forms/cd-form'; +import { CdFormBuilder } from '~/app/shared/forms/cd-form-builder'; +import { CdFormGroup } from '~/app/shared/forms/cd-form-group'; +import { CdValidators } from '~/app/shared/forms/cd-validators'; +import { CdPwdExpirationSettings } from '~/app/shared/models/cd-pwd-expiration-settings'; +import { AuthStorageService } from '~/app/shared/services/auth-storage.service'; +import { ModalService } from '~/app/shared/services/modal.service'; +import { NotificationService } from '~/app/shared/services/notification.service'; +import { PasswordPolicyService } from '~/app/shared/services/password-policy.service'; import { UserFormMode } from './user-form-mode.enum'; import { UserFormRoleModel } from './user-form-role.model'; import { UserFormModel } from './user-form.model'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/auth/user-list/user-list.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/user-list/user-list.component.spec.ts index 7cc70765a15..247a116a0b1 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/core/auth/user-list/user-list.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/user-list/user-list.component.spec.ts @@ -6,9 +6,9 @@ import { RouterTestingModule } from '@angular/router/testing'; import { NgbNavModule } from '@ng-bootstrap/ng-bootstrap'; import { ToastrModule } from 'ngx-toastr'; -import { configureTestBed, PermissionHelper } from '../../../../testing/unit-test-helper'; -import { TableActionsComponent } from '../../../shared/datatable/table-actions/table-actions.component'; -import { SharedModule } from '../../../shared/shared.module'; +import { configureTestBed, PermissionHelper } from '~/testing/unit-test-helper'; +import { TableActionsComponent } from '~/app/shared/datatable/table-actions/table-actions.component'; +import { SharedModule } from '~/app/shared/shared.module'; import { UserTabsComponent } from '../user-tabs/user-tabs.component'; import { UserListComponent } from './user-list.component'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/auth/user-list/user-list.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/user-list/user-list.component.ts index c9b21f267a4..09c0d82fcc4 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/core/auth/user-list/user-list.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/user-list/user-list.component.ts @@ -2,22 +2,22 @@ import { Component, OnInit, TemplateRef, ViewChild } from '@angular/core'; import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; -import { UserService } from '../../../shared/api/user.service'; -import { CriticalConfirmationModalComponent } from '../../../shared/components/critical-confirmation-modal/critical-confirmation-modal.component'; -import { ActionLabelsI18n } from '../../../shared/constants/app.constants'; -import { CellTemplate } from '../../../shared/enum/cell-template.enum'; -import { Icons } from '../../../shared/enum/icons.enum'; -import { NotificationType } from '../../../shared/enum/notification-type.enum'; -import { CdTableAction } from '../../../shared/models/cd-table-action'; -import { CdTableColumn } from '../../../shared/models/cd-table-column'; -import { CdTableSelection } from '../../../shared/models/cd-table-selection'; -import { Permission } from '../../../shared/models/permissions'; -import { CdDatePipe } from '../../../shared/pipes/cd-date.pipe'; -import { EmptyPipe } from '../../../shared/pipes/empty.pipe'; -import { AuthStorageService } from '../../../shared/services/auth-storage.service'; -import { ModalService } from '../../../shared/services/modal.service'; -import { NotificationService } from '../../../shared/services/notification.service'; -import { URLBuilderService } from '../../../shared/services/url-builder.service'; +import { UserService } from '~/app/shared/api/user.service'; +import { CriticalConfirmationModalComponent } from '~/app/shared/components/critical-confirmation-modal/critical-confirmation-modal.component'; +import { ActionLabelsI18n } from '~/app/shared/constants/app.constants'; +import { CellTemplate } from '~/app/shared/enum/cell-template.enum'; +import { Icons } from '~/app/shared/enum/icons.enum'; +import { NotificationType } from '~/app/shared/enum/notification-type.enum'; +import { CdTableAction } from '~/app/shared/models/cd-table-action'; +import { CdTableColumn } from '~/app/shared/models/cd-table-column'; +import { CdTableSelection } from '~/app/shared/models/cd-table-selection'; +import { Permission } from '~/app/shared/models/permissions'; +import { CdDatePipe } from '~/app/shared/pipes/cd-date.pipe'; +import { EmptyPipe } from '~/app/shared/pipes/empty.pipe'; +import { AuthStorageService } from '~/app/shared/services/auth-storage.service'; +import { ModalService } from '~/app/shared/services/modal.service'; +import { NotificationService } from '~/app/shared/services/notification.service'; +import { URLBuilderService } from '~/app/shared/services/url-builder.service'; const BASE_URL = 'user-management/users'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/auth/user-password-form/user-password-form.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/user-password-form/user-password-form.component.spec.ts index 7adaebaba3b..8cf922aa41f 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/core/auth/user-password-form/user-password-form.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/user-password-form/user-password-form.component.spec.ts @@ -6,11 +6,11 @@ import { RouterTestingModule } from '@angular/router/testing'; import { ToastrModule } from 'ngx-toastr'; -import { configureTestBed, FormHelper } from '../../../../testing/unit-test-helper'; -import { ComponentsModule } from '../../../shared/components/components.module'; -import { CdFormGroup } from '../../../shared/forms/cd-form-group'; -import { AuthStorageService } from '../../../shared/services/auth-storage.service'; -import { SharedModule } from '../../../shared/shared.module'; +import { configureTestBed, FormHelper } from '~/testing/unit-test-helper'; +import { ComponentsModule } from '~/app/shared/components/components.module'; +import { CdFormGroup } from '~/app/shared/forms/cd-form-group'; +import { AuthStorageService } from '~/app/shared/services/auth-storage.service'; +import { SharedModule } from '~/app/shared/shared.module'; import { UserPasswordFormComponent } from './user-password-form.component'; describe('UserPasswordFormComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/auth/user-password-form/user-password-form.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/user-password-form/user-password-form.component.ts index 7d6f9127e4c..dffb927ac16 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/core/auth/user-password-form/user-password-form.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/user-password-form/user-password-form.component.ts @@ -4,16 +4,16 @@ import { Router } from '@angular/router'; import _ from 'lodash'; -import { UserService } from '../../../shared/api/user.service'; -import { ActionLabelsI18n } from '../../../shared/constants/app.constants'; -import { Icons } from '../../../shared/enum/icons.enum'; -import { NotificationType } from '../../../shared/enum/notification-type.enum'; -import { CdFormBuilder } from '../../../shared/forms/cd-form-builder'; -import { CdFormGroup } from '../../../shared/forms/cd-form-group'; -import { CdValidators } from '../../../shared/forms/cd-validators'; -import { AuthStorageService } from '../../../shared/services/auth-storage.service'; -import { NotificationService } from '../../../shared/services/notification.service'; -import { PasswordPolicyService } from '../../../shared/services/password-policy.service'; +import { UserService } from '~/app/shared/api/user.service'; +import { ActionLabelsI18n } from '~/app/shared/constants/app.constants'; +import { Icons } from '~/app/shared/enum/icons.enum'; +import { NotificationType } from '~/app/shared/enum/notification-type.enum'; +import { CdFormBuilder } from '~/app/shared/forms/cd-form-builder'; +import { CdFormGroup } from '~/app/shared/forms/cd-form-group'; +import { CdValidators } from '~/app/shared/forms/cd-validators'; +import { AuthStorageService } from '~/app/shared/services/auth-storage.service'; +import { NotificationService } from '~/app/shared/services/notification.service'; +import { PasswordPolicyService } from '~/app/shared/services/password-policy.service'; @Component({ selector: 'cd-user-password-form', diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/auth/user-tabs/user-tabs.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/user-tabs/user-tabs.component.spec.ts index 7e0af5980e3..46b0ab5b0e6 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/core/auth/user-tabs/user-tabs.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/user-tabs/user-tabs.component.spec.ts @@ -4,8 +4,8 @@ import { RouterTestingModule } from '@angular/router/testing'; import { NgbNavModule } from '@ng-bootstrap/ng-bootstrap'; -import { configureTestBed } from '../../../../testing/unit-test-helper'; -import { SharedModule } from '../../../shared/shared.module'; +import { configureTestBed } from '~/testing/unit-test-helper'; +import { SharedModule } from '~/app/shared/shared.module'; import { UserTabsComponent } from './user-tabs.component'; describe('UserTabsComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/forbidden/forbidden.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/core/forbidden/forbidden.component.spec.ts index 7a53554d753..75d3778f8fc 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/core/forbidden/forbidden.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/core/forbidden/forbidden.component.spec.ts @@ -1,7 +1,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; -import { configureTestBed } from '../../../testing/unit-test-helper'; +import { configureTestBed } from '~/testing/unit-test-helper'; import { ForbiddenComponent } from './forbidden.component'; describe('ForbiddenComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/forbidden/forbidden.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/core/forbidden/forbidden.component.ts index 81fffbc6307..6a77f18d541 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/core/forbidden/forbidden.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/core/forbidden/forbidden.component.ts @@ -1,6 +1,6 @@ import { Component } from '@angular/core'; -import { Icons } from '../../shared/enum/icons.enum'; +import { Icons } from '~/app/shared/enum/icons.enum'; @Component({ selector: 'cd-forbidden', diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/layouts/blank-layout/blank-layout.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/core/layouts/blank-layout/blank-layout.component.spec.ts index 2b836c7138d..faee6aa9b34 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/core/layouts/blank-layout/blank-layout.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/core/layouts/blank-layout/blank-layout.component.spec.ts @@ -1,7 +1,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; -import { configureTestBed } from '../../../../testing/unit-test-helper'; +import { configureTestBed } from '~/testing/unit-test-helper'; import { BlankLayoutComponent } from './blank-layout.component'; describe('DefaultLayoutComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/layouts/login-layout/login-layout.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/core/layouts/login-layout/login-layout.component.spec.ts index 575984aa0b2..81d1083bba0 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/core/layouts/login-layout/login-layout.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/core/layouts/login-layout/login-layout.component.spec.ts @@ -3,8 +3,8 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { RouterTestingModule } from '@angular/router/testing'; -import { configureTestBed } from '../../../../testing/unit-test-helper'; -import { SharedModule } from '../../../shared/shared.module'; +import { configureTestBed } from '~/testing/unit-test-helper'; +import { SharedModule } from '~/app/shared/shared.module'; import { LoginLayoutComponent } from './login-layout.component'; describe('LoginLayoutComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/layouts/workbench-layout/workbench-layout.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/core/layouts/workbench-layout/workbench-layout.component.spec.ts index 587925bf46b..150f75cf04e 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/core/layouts/workbench-layout/workbench-layout.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/core/layouts/workbench-layout/workbench-layout.component.spec.ts @@ -5,10 +5,10 @@ import { RouterTestingModule } from '@angular/router/testing'; import { ToastrModule } from 'ngx-toastr'; -import { configureTestBed } from '../../../../testing/unit-test-helper'; -import { RbdService } from '../../../shared/api/rbd.service'; -import { PipesModule } from '../../../shared/pipes/pipes.module'; -import { AuthStorageService } from '../../../shared/services/auth-storage.service'; +import { configureTestBed } from '~/testing/unit-test-helper'; +import { RbdService } from '~/app/shared/api/rbd.service'; +import { PipesModule } from '~/app/shared/pipes/pipes.module'; +import { AuthStorageService } from '~/app/shared/services/auth-storage.service'; import { WorkbenchLayoutComponent } from './workbench-layout.component'; describe('WorkbenchLayoutComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/layouts/workbench-layout/workbench-layout.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/core/layouts/workbench-layout/workbench-layout.component.ts index 5305d2abae4..f2070be5fe0 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/core/layouts/workbench-layout/workbench-layout.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/core/layouts/workbench-layout/workbench-layout.component.ts @@ -3,9 +3,9 @@ import { Router } from '@angular/router'; import { Subscription } from 'rxjs'; -import { FaviconService } from '../../../shared/services/favicon.service'; -import { SummaryService } from '../../../shared/services/summary.service'; -import { TaskManagerService } from '../../../shared/services/task-manager.service'; +import { FaviconService } from '~/app/shared/services/favicon.service'; +import { SummaryService } from '~/app/shared/services/summary.service'; +import { TaskManagerService } from '~/app/shared/services/task-manager.service'; @Component({ selector: 'cd-workbench-layout', diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/about/about.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/about/about.component.spec.ts index 1803f297e50..02cb7b7f658 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/about/about.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/about/about.component.spec.ts @@ -4,10 +4,10 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { BehaviorSubject } from 'rxjs'; -import { environment } from '../../../../environments/environment'; -import { configureTestBed } from '../../../../testing/unit-test-helper'; -import { SummaryService } from '../../../shared/services/summary.service'; -import { SharedModule } from '../../../shared/shared.module'; +import { environment } from '~/environments/environment'; +import { configureTestBed } from '~/testing/unit-test-helper'; +import { SummaryService } from '~/app/shared/services/summary.service'; +import { SharedModule } from '~/app/shared/shared.module'; import { AboutComponent } from './about.component'; export class SummaryServiceMock { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/about/about.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/about/about.component.ts index baf5a7c2f27..64b26bfc6c8 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/about/about.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/about/about.component.ts @@ -4,11 +4,11 @@ import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { detect } from 'detect-browser'; import { Subscription } from 'rxjs'; -import { UserService } from '../../../shared/api/user.service'; -import { AppConstants } from '../../../shared/constants/app.constants'; -import { Permission } from '../../../shared/models/permissions'; -import { AuthStorageService } from '../../../shared/services/auth-storage.service'; -import { SummaryService } from '../../../shared/services/summary.service'; +import { UserService } from '~/app/shared/api/user.service'; +import { AppConstants } from '~/app/shared/constants/app.constants'; +import { Permission } from '~/app/shared/models/permissions'; +import { AuthStorageService } from '~/app/shared/services/auth-storage.service'; +import { SummaryService } from '~/app/shared/services/summary.service'; @Component({ selector: 'cd-about', diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/administration/administration.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/administration/administration.component.spec.ts index ae695068d90..c09af97c4be 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/administration/administration.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/administration/administration.component.spec.ts @@ -1,7 +1,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { configureTestBed } from '../../../../testing/unit-test-helper'; -import { SharedModule } from '../../../shared/shared.module'; +import { configureTestBed } from '~/testing/unit-test-helper'; +import { SharedModule } from '~/app/shared/shared.module'; import { AdministrationComponent } from './administration.component'; describe('AdministrationComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/administration/administration.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/administration/administration.component.ts index cbdae392259..60cd17ec68a 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/administration/administration.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/administration/administration.component.ts @@ -1,8 +1,8 @@ import { Component } from '@angular/core'; -import { Icons } from '../../../shared/enum/icons.enum'; -import { Permission } from '../../../shared/models/permissions'; -import { AuthStorageService } from '../../../shared/services/auth-storage.service'; +import { Icons } from '~/app/shared/enum/icons.enum'; +import { Permission } from '~/app/shared/models/permissions'; +import { AuthStorageService } from '~/app/shared/services/auth-storage.service'; @Component({ selector: 'cd-administration', diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/breadcrumbs/breadcrumbs.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/breadcrumbs/breadcrumbs.component.spec.ts index 5bb656157d9..8c74ec48289 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/breadcrumbs/breadcrumbs.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/breadcrumbs/breadcrumbs.component.spec.ts @@ -4,8 +4,8 @@ import { ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testin import { Router, Routes } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; -import { configureTestBed } from '../../../../testing/unit-test-helper'; -import { PerformanceCounterBreadcrumbsResolver } from '../../../app-routing.module'; +import { configureTestBed } from '~/testing/unit-test-helper'; +import { PerformanceCounterBreadcrumbsResolver } from '~/app/app-routing.module'; import { BreadcrumbsComponent } from './breadcrumbs.component'; describe('BreadcrumbsComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/breadcrumbs/breadcrumbs.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/breadcrumbs/breadcrumbs.component.ts index 21a0e30bbf2..d933081ab9c 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/breadcrumbs/breadcrumbs.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/breadcrumbs/breadcrumbs.component.ts @@ -28,7 +28,7 @@ import { ActivatedRouteSnapshot, NavigationEnd, NavigationStart, Router } from ' import { concat, from, Observable, of, Subscription } from 'rxjs'; import { distinct, filter, first, mergeMap, toArray } from 'rxjs/operators'; -import { BreadcrumbsResolver, IBreadcrumb } from '../../../shared/models/breadcrumbs'; +import { BreadcrumbsResolver, IBreadcrumb } from '~/app/shared/models/breadcrumbs'; @Component({ selector: 'cd-breadcrumbs', diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/dashboard-help/dashboard-help.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/dashboard-help/dashboard-help.component.spec.ts index e6a61bba47f..52ba90abb63 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/dashboard-help/dashboard-help.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/dashboard-help/dashboard-help.component.spec.ts @@ -2,8 +2,8 @@ import { HttpClientTestingModule } from '@angular/common/http/testing'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; -import { configureTestBed } from '../../../../testing/unit-test-helper'; -import { SharedModule } from '../../../shared/shared.module'; +import { configureTestBed } from '~/testing/unit-test-helper'; +import { SharedModule } from '~/app/shared/shared.module'; import { DashboardHelpComponent } from './dashboard-help.component'; describe('DashboardHelpComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/dashboard-help/dashboard-help.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/dashboard-help/dashboard-help.component.ts index c5036e5b8dd..6be29308312 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/dashboard-help/dashboard-help.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/dashboard-help/dashboard-help.component.ts @@ -2,10 +2,10 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; -import { Icons } from '../../../shared/enum/icons.enum'; -import { AuthStorageService } from '../../../shared/services/auth-storage.service'; -import { DocService } from '../../../shared/services/doc.service'; -import { ModalService } from '../../../shared/services/modal.service'; +import { Icons } from '~/app/shared/enum/icons.enum'; +import { AuthStorageService } from '~/app/shared/services/auth-storage.service'; +import { DocService } from '~/app/shared/services/doc.service'; +import { ModalService } from '~/app/shared/services/modal.service'; import { AboutComponent } from '../about/about.component'; @Component({ diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/identity/identity.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/identity/identity.component.spec.ts index 17f0ac0bfb8..77ed8c92b39 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/identity/identity.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/identity/identity.component.spec.ts @@ -2,8 +2,8 @@ import { HttpClientTestingModule } from '@angular/common/http/testing'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; -import { configureTestBed } from '../../../../testing/unit-test-helper'; -import { SharedModule } from '../../../shared/shared.module'; +import { configureTestBed } from '~/testing/unit-test-helper'; +import { SharedModule } from '~/app/shared/shared.module'; import { IdentityComponent } from './identity.component'; describe('IdentityComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/identity/identity.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/identity/identity.component.ts index 6d4843d3d24..c1d33b93872 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/identity/identity.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/identity/identity.component.ts @@ -1,8 +1,8 @@ import { Component, OnInit } from '@angular/core'; -import { AuthService } from '../../../shared/api/auth.service'; -import { Icons } from '../../../shared/enum/icons.enum'; -import { AuthStorageService } from '../../../shared/services/auth-storage.service'; +import { AuthService } from '~/app/shared/api/auth.service'; +import { Icons } from '~/app/shared/enum/icons.enum'; +import { AuthStorageService } from '~/app/shared/services/auth-storage.service'; @Component({ selector: 'cd-identity', diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/navigation.module.ts b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/navigation.module.ts index b820f16a455..f189ad41b85 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/navigation.module.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/navigation.module.ts @@ -5,8 +5,8 @@ import { RouterModule } from '@angular/router'; import { NgbCollapseModule, NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap'; import { SimplebarAngularModule } from 'simplebar-angular'; -import { AppRoutingModule } from '../../app-routing.module'; -import { SharedModule } from '../../shared/shared.module'; +import { AppRoutingModule } from '~/app/app-routing.module'; +import { SharedModule } from '~/app/shared/shared.module'; import { AuthModule } from '../auth/auth.module'; import { AboutComponent } from './about/about.component'; import { AdministrationComponent } from './administration/administration.component'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/navigation/navigation.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/navigation/navigation.component.spec.ts index 25fb4d6f789..58d5f24c6d0 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/navigation/navigation.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/navigation/navigation.component.spec.ts @@ -4,16 +4,16 @@ import { By } from '@angular/platform-browser'; import { MockModule } from 'ng-mocks'; import { of } from 'rxjs'; -import { configureTestBed } from '../../../../testing/unit-test-helper'; -import { Permission, Permissions } from '../../../shared/models/permissions'; -import { AuthStorageService } from '../../../shared/services/auth-storage.service'; +import { configureTestBed } from '~/testing/unit-test-helper'; +import { Permission, Permissions } from '~/app/shared/models/permissions'; +import { AuthStorageService } from '~/app/shared/services/auth-storage.service'; import { Features, FeatureTogglesMap, FeatureTogglesService -} from '../../../shared/services/feature-toggles.service'; -import { PrometheusAlertService } from '../../../shared/services/prometheus-alert.service'; -import { SummaryService } from '../../../shared/services/summary.service'; +} from '~/app/shared/services/feature-toggles.service'; +import { PrometheusAlertService } from '~/app/shared/services/prometheus-alert.service'; +import { SummaryService } from '~/app/shared/services/summary.service'; import { NavigationModule } from '../navigation.module'; import { NavigationComponent } from './navigation.component'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/navigation/navigation.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/navigation/navigation.component.ts index 5d45104cb82..bf6acb84bb4 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/navigation/navigation.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/navigation/navigation.component.ts @@ -2,16 +2,16 @@ import { Component, HostBinding, OnDestroy, OnInit } from '@angular/core'; import { Subscription } from 'rxjs'; -import { Icons } from '../../../shared/enum/icons.enum'; -import { Permissions } from '../../../shared/models/permissions'; -import { AuthStorageService } from '../../../shared/services/auth-storage.service'; +import { Icons } from '~/app/shared/enum/icons.enum'; +import { Permissions } from '~/app/shared/models/permissions'; +import { AuthStorageService } from '~/app/shared/services/auth-storage.service'; import { FeatureTogglesMap$, FeatureTogglesService -} from '../../../shared/services/feature-toggles.service'; -import { PrometheusAlertService } from '../../../shared/services/prometheus-alert.service'; -import { SummaryService } from '../../../shared/services/summary.service'; -import { TelemetryNotificationService } from '../../../shared/services/telemetry-notification.service'; +} from '~/app/shared/services/feature-toggles.service'; +import { PrometheusAlertService } from '~/app/shared/services/prometheus-alert.service'; +import { SummaryService } from '~/app/shared/services/summary.service'; +import { TelemetryNotificationService } from '~/app/shared/services/telemetry-notification.service'; @Component({ selector: 'cd-navigation', diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/notifications/notifications.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/notifications/notifications.component.spec.ts index cf06c786d1a..f96844d712e 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/notifications/notifications.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/notifications/notifications.component.spec.ts @@ -4,12 +4,12 @@ import { RouterTestingModule } from '@angular/router/testing'; import { ToastrModule } from 'ngx-toastr'; -import { configureTestBed } from '../../../../testing/unit-test-helper'; -import { CdNotification, CdNotificationConfig } from '../../../shared/models/cd-notification'; -import { ExecutingTask } from '../../../shared/models/executing-task'; -import { NotificationService } from '../../../shared/services/notification.service'; -import { SummaryService } from '../../../shared/services/summary.service'; -import { SharedModule } from '../../../shared/shared.module'; +import { configureTestBed } from '~/testing/unit-test-helper'; +import { CdNotification, CdNotificationConfig } from '~/app/shared/models/cd-notification'; +import { ExecutingTask } from '~/app/shared/models/executing-task'; +import { NotificationService } from '~/app/shared/services/notification.service'; +import { SummaryService } from '~/app/shared/services/summary.service'; +import { SharedModule } from '~/app/shared/shared.module'; import { NotificationsComponent } from './notifications.component'; describe('NotificationsComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/notifications/notifications.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/notifications/notifications.component.ts index 27d74360cdd..89c6c403794 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/notifications/notifications.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/notifications/notifications.component.ts @@ -2,10 +2,10 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; import { Subscription } from 'rxjs'; -import { Icons } from '../../../shared/enum/icons.enum'; -import { CdNotification } from '../../../shared/models/cd-notification'; -import { NotificationService } from '../../../shared/services/notification.service'; -import { SummaryService } from '../../../shared/services/summary.service'; +import { Icons } from '~/app/shared/enum/icons.enum'; +import { CdNotification } from '~/app/shared/models/cd-notification'; +import { NotificationService } from '~/app/shared/services/notification.service'; +import { SummaryService } from '~/app/shared/services/summary.service'; @Component({ selector: 'cd-notifications', diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/not-found/not-found.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/core/not-found/not-found.component.spec.ts index 3adb9c3f32f..7d64730181f 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/core/not-found/not-found.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/core/not-found/not-found.component.spec.ts @@ -1,7 +1,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; -import { configureTestBed } from '../../../testing/unit-test-helper'; +import { configureTestBed } from '~/testing/unit-test-helper'; import { NotFoundComponent } from './not-found.component'; describe('NotFoundComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/auth.service.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/auth.service.spec.ts index 484a280b7be..5c759804d40 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/auth.service.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/auth.service.spec.ts @@ -3,7 +3,7 @@ import { fakeAsync, TestBed, tick } from '@angular/core/testing'; import { Router, Routes } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; -import { configureTestBed } from '../../../testing/unit-test-helper'; +import { configureTestBed } from '~/testing/unit-test-helper'; import { AuthStorageService } from '../services/auth-storage.service'; import { AuthService } from './auth.service'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/cephfs.service.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/cephfs.service.spec.ts index f685035ea53..58395cd6705 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/cephfs.service.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/cephfs.service.spec.ts @@ -1,7 +1,7 @@ import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; import { TestBed } from '@angular/core/testing'; -import { configureTestBed } from '../../../testing/unit-test-helper'; +import { configureTestBed } from '~/testing/unit-test-helper'; import { CephfsService } from './cephfs.service'; describe('CephfsService', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/configuration.service.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/configuration.service.spec.ts index cbd9e1d0300..20bdb6e2876 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/configuration.service.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/configuration.service.spec.ts @@ -1,8 +1,8 @@ import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; import { TestBed } from '@angular/core/testing'; -import { configureTestBed } from '../../../testing/unit-test-helper'; -import { ConfigFormCreateRequestModel } from '../../ceph/cluster/configuration/configuration-form/configuration-form-create-request.model'; +import { configureTestBed } from '~/testing/unit-test-helper'; +import { ConfigFormCreateRequestModel } from '~/app/ceph/cluster/configuration/configuration-form/configuration-form-create-request.model'; import { ConfigurationService } from './configuration.service'; describe('ConfigurationService', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/configuration.service.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/configuration.service.ts index 44284d73427..5bad098c9af 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/configuration.service.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/configuration.service.ts @@ -1,7 +1,7 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; -import { ConfigFormCreateRequestModel } from '../../ceph/cluster/configuration/configuration-form/configuration-form-create-request.model'; +import { ConfigFormCreateRequestModel } from '~/app/ceph/cluster/configuration/configuration-form/configuration-form-create-request.model'; @Injectable({ providedIn: 'root' diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/crush-rule.service.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/crush-rule.service.spec.ts index 39bdf0c8183..1142e53682e 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/crush-rule.service.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/crush-rule.service.spec.ts @@ -1,7 +1,7 @@ import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; import { TestBed } from '@angular/core/testing'; -import { configureTestBed } from '../../../testing/unit-test-helper'; +import { configureTestBed } from '~/testing/unit-test-helper'; import { CrushRuleService } from './crush-rule.service'; describe('CrushRuleService', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/erasure-code-profile.service.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/erasure-code-profile.service.spec.ts index 88888b5222e..caf3da0c642 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/erasure-code-profile.service.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/erasure-code-profile.service.spec.ts @@ -1,7 +1,7 @@ import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; import { TestBed } from '@angular/core/testing'; -import { configureTestBed } from '../../../testing/unit-test-helper'; +import { configureTestBed } from '~/testing/unit-test-helper'; import { ErasureCodeProfile } from '../models/erasure-code-profile'; import { ErasureCodeProfileService } from './erasure-code-profile.service'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/health.service.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/health.service.spec.ts index eaf5d029bd1..84eeac0f31a 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/health.service.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/health.service.spec.ts @@ -1,7 +1,7 @@ import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; import { TestBed } from '@angular/core/testing'; -import { configureTestBed } from '../../../testing/unit-test-helper'; +import { configureTestBed } from '~/testing/unit-test-helper'; import { HealthService } from './health.service'; describe('HealthService', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/host.service.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/host.service.spec.ts index d4a36700e65..aea5f045ffc 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/host.service.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/host.service.spec.ts @@ -1,7 +1,7 @@ import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; import { fakeAsync, TestBed, tick } from '@angular/core/testing'; -import { configureTestBed } from '../../../testing/unit-test-helper'; +import { configureTestBed } from '~/testing/unit-test-helper'; import { HostService } from './host.service'; describe('HostService', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/iscsi.service.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/iscsi.service.spec.ts index 9ee4eb5b8ec..fcb1804a671 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/iscsi.service.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/iscsi.service.spec.ts @@ -1,7 +1,7 @@ import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; import { TestBed } from '@angular/core/testing'; -import { configureTestBed } from '../../../testing/unit-test-helper'; +import { configureTestBed } from '~/testing/unit-test-helper'; import { IscsiService } from './iscsi.service'; describe('IscsiService', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/logging.service.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/logging.service.spec.ts index 90eb5adba57..6458827f0f5 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/logging.service.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/logging.service.spec.ts @@ -1,7 +1,7 @@ import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; import { TestBed } from '@angular/core/testing'; -import { configureTestBed } from '../../../testing/unit-test-helper'; +import { configureTestBed } from '~/testing/unit-test-helper'; import { LoggingService } from './logging.service'; describe('LoggingService', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/logs.service.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/logs.service.spec.ts index 626eeea9003..82c12dad835 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/logs.service.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/logs.service.spec.ts @@ -1,7 +1,7 @@ import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; import { TestBed } from '@angular/core/testing'; -import { configureTestBed } from '../../../testing/unit-test-helper'; +import { configureTestBed } from '~/testing/unit-test-helper'; import { LogsService } from './logs.service'; describe('LogsService', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/mgr-module.service.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/mgr-module.service.spec.ts index 7d262b39601..77e6fb22119 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/mgr-module.service.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/mgr-module.service.spec.ts @@ -1,7 +1,7 @@ import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; import { TestBed } from '@angular/core/testing'; -import { configureTestBed } from '../../../testing/unit-test-helper'; +import { configureTestBed } from '~/testing/unit-test-helper'; import { MgrModuleService } from './mgr-module.service'; describe('MgrModuleService', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/monitor.service.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/monitor.service.spec.ts index 4fc78ea785e..29396866d8d 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/monitor.service.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/monitor.service.spec.ts @@ -1,7 +1,7 @@ import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; import { TestBed } from '@angular/core/testing'; -import { configureTestBed } from '../../../testing/unit-test-helper'; +import { configureTestBed } from '~/testing/unit-test-helper'; import { MonitorService } from './monitor.service'; describe('MonitorService', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/nfs.service.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/nfs.service.spec.ts index 247be05b234..07f5a1890fb 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/nfs.service.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/nfs.service.spec.ts @@ -1,7 +1,7 @@ import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; import { TestBed } from '@angular/core/testing'; -import { configureTestBed } from '../../../testing/unit-test-helper'; +import { configureTestBed } from '~/testing/unit-test-helper'; import { NfsService } from './nfs.service'; describe('NfsService', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/orchestrator.service.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/orchestrator.service.spec.ts index bf1c433a136..4dfc595bfee 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/orchestrator.service.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/orchestrator.service.spec.ts @@ -1,7 +1,7 @@ import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; import { TestBed } from '@angular/core/testing'; -import { configureTestBed } from '../../../testing/unit-test-helper'; +import { configureTestBed } from '~/testing/unit-test-helper'; import { OrchestratorService } from './orchestrator.service'; describe('OrchestratorService', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/orchestrator.service.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/orchestrator.service.ts index 6be70861e69..ddd0f75bb4d 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/orchestrator.service.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/orchestrator.service.ts @@ -5,8 +5,8 @@ import _ from 'lodash'; import { Observable, of as observableOf } from 'rxjs'; import { mergeMap } from 'rxjs/operators'; -import { InventoryDevice } from '../../ceph/cluster/inventory/inventory-devices/inventory-device.model'; -import { InventoryHost } from '../../ceph/cluster/inventory/inventory-host.model'; +import { InventoryDevice } from '~/app/ceph/cluster/inventory/inventory-devices/inventory-device.model'; +import { InventoryHost } from '~/app/ceph/cluster/inventory/inventory-host.model'; import { OrchestratorFeature } from '../models/orchestrator.enum'; import { OrchestratorStatus } from '../models/orchestrator.interface'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/osd.service.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/osd.service.spec.ts index 9179a5e6d33..135bbaf39bc 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/osd.service.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/osd.service.spec.ts @@ -1,7 +1,7 @@ import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; import { TestBed } from '@angular/core/testing'; -import { configureTestBed } from '../../../testing/unit-test-helper'; +import { configureTestBed } from '~/testing/unit-test-helper'; import { OsdService } from './osd.service'; describe('OsdService', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/performance-counter.service.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/performance-counter.service.spec.ts index 46c07d402be..12b13787b91 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/performance-counter.service.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/performance-counter.service.spec.ts @@ -1,7 +1,7 @@ import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; import { TestBed } from '@angular/core/testing'; -import { configureTestBed } from '../../../testing/unit-test-helper'; +import { configureTestBed } from '~/testing/unit-test-helper'; import { PerformanceCounterService } from './performance-counter.service'; describe('PerformanceCounterService', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/pool.service.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/pool.service.spec.ts index c0e7cb0eabb..292da3c21a0 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/pool.service.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/pool.service.spec.ts @@ -1,7 +1,7 @@ import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; import { fakeAsync, TestBed, tick } from '@angular/core/testing'; -import { configureTestBed } from '../../../testing/unit-test-helper'; +import { configureTestBed } from '~/testing/unit-test-helper'; import { RbdConfigurationSourceField } from '../models/configuration'; import { RbdConfigurationService } from '../services/rbd-configuration.service'; import { PoolService } from './pool.service'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/prometheus.service.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/prometheus.service.spec.ts index 90feafc4714..c42f6e7ac12 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/prometheus.service.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/prometheus.service.spec.ts @@ -1,7 +1,7 @@ import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; import { TestBed } from '@angular/core/testing'; -import { configureTestBed } from '../../../testing/unit-test-helper'; +import { configureTestBed } from '~/testing/unit-test-helper'; import { AlertmanagerNotification } from '../models/prometheus-alerts'; import { PrometheusService } from './prometheus.service'; import { SettingsService } from './settings.service'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/rbd-mirroring.service.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/rbd-mirroring.service.spec.ts index 3f9a17ed09a..3f883d91fdf 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/rbd-mirroring.service.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/rbd-mirroring.service.spec.ts @@ -6,7 +6,7 @@ import { } from '@angular/common/http/testing'; import { fakeAsync, TestBed, tick } from '@angular/core/testing'; -import { configureTestBed } from '../../../testing/unit-test-helper'; +import { configureTestBed } from '~/testing/unit-test-helper'; import { RbdMirroringService } from './rbd-mirroring.service'; describe('RbdMirroringService', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/rbd.service.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/rbd.service.spec.ts index dae61e7e192..a66d861e464 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/rbd.service.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/rbd.service.spec.ts @@ -1,7 +1,7 @@ import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; import { TestBed } from '@angular/core/testing'; -import { configureTestBed } from '../../../testing/unit-test-helper'; +import { configureTestBed } from '~/testing/unit-test-helper'; import { ImageSpec } from '../models/image-spec'; import { RbdConfigurationService } from '../services/rbd-configuration.service'; import { RbdService } from './rbd.service'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/rgw-bucket.service.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/rgw-bucket.service.spec.ts index ff460e65e9c..aa33df3888d 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/rgw-bucket.service.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/rgw-bucket.service.spec.ts @@ -1,7 +1,7 @@ import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; import { TestBed } from '@angular/core/testing'; -import { configureTestBed } from '../../../testing/unit-test-helper'; +import { configureTestBed } from '~/testing/unit-test-helper'; import { RgwBucketService } from './rgw-bucket.service'; describe('RgwBucketService', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/rgw-daemon.service.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/rgw-daemon.service.spec.ts index 9f85b04e384..8aa4ea0a480 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/rgw-daemon.service.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/rgw-daemon.service.spec.ts @@ -1,7 +1,7 @@ import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; import { TestBed } from '@angular/core/testing'; -import { configureTestBed } from '../../../testing/unit-test-helper'; +import { configureTestBed } from '~/testing/unit-test-helper'; import { RgwDaemonService } from './rgw-daemon.service'; describe('RgwDaemonService', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/rgw-site.service.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/rgw-site.service.spec.ts index d344c53b9d8..5dcdbf4cf79 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/rgw-site.service.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/rgw-site.service.spec.ts @@ -1,7 +1,7 @@ import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; import { TestBed } from '@angular/core/testing'; -import { configureTestBed } from '../../../testing/unit-test-helper'; +import { configureTestBed } from '~/testing/unit-test-helper'; import { RgwSiteService } from './rgw-site.service'; describe('RgwSiteService', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/rgw-user.service.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/rgw-user.service.spec.ts index 271480c3dab..35963981590 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/rgw-user.service.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/rgw-user.service.spec.ts @@ -3,7 +3,7 @@ import { TestBed } from '@angular/core/testing'; import { of as observableOf } from 'rxjs'; -import { configureTestBed } from '../../../testing/unit-test-helper'; +import { configureTestBed } from '~/testing/unit-test-helper'; import { RgwUserService } from './rgw-user.service'; describe('RgwUserService', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/role.service.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/role.service.spec.ts index c7edbbfd1e8..8505461ff95 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/role.service.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/role.service.spec.ts @@ -1,7 +1,7 @@ import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; import { TestBed } from '@angular/core/testing'; -import { configureTestBed } from '../../../testing/unit-test-helper'; +import { configureTestBed } from '~/testing/unit-test-helper'; import { RoleService } from './role.service'; describe('RoleService', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/role.service.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/role.service.ts index fada767e42a..7dc906da18b 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/role.service.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/role.service.ts @@ -4,7 +4,7 @@ import { Injectable } from '@angular/core'; import { Observable, of as observableOf } from 'rxjs'; import { mergeMap } from 'rxjs/operators'; -import { RoleFormModel } from '../../core/auth/role-form/role-form.model'; +import { RoleFormModel } from '~/app/core/auth/role-form/role-form.model'; @Injectable({ providedIn: 'root' diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/scope.service.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/scope.service.spec.ts index 23ec2b08d76..811e1924fb5 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/scope.service.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/scope.service.spec.ts @@ -1,7 +1,7 @@ import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; import { TestBed } from '@angular/core/testing'; -import { configureTestBed } from '../../../testing/unit-test-helper'; +import { configureTestBed } from '~/testing/unit-test-helper'; import { ScopeService } from './scope.service'; describe('ScopeService', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/settings.service.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/settings.service.spec.ts index 982f25bf92f..06bd198232d 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/settings.service.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/settings.service.spec.ts @@ -1,7 +1,7 @@ import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; import { fakeAsync, TestBed, tick } from '@angular/core/testing'; -import { configureTestBed } from '../../../testing/unit-test-helper'; +import { configureTestBed } from '~/testing/unit-test-helper'; import { SettingsService } from './settings.service'; describe('SettingsService', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/telemetry.service.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/telemetry.service.spec.ts index 822610f441e..a90fcff7a75 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/telemetry.service.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/telemetry.service.spec.ts @@ -1,7 +1,7 @@ import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; import { TestBed } from '@angular/core/testing'; -import { configureTestBed } from '../../../testing/unit-test-helper'; +import { configureTestBed } from '~/testing/unit-test-helper'; import { TelemetryService } from './telemetry.service'; describe('TelemetryService', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/user.service.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/user.service.spec.ts index 8f50c0d8e82..a95ed5a874d 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/user.service.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/user.service.spec.ts @@ -1,8 +1,8 @@ import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; import { TestBed } from '@angular/core/testing'; -import { configureTestBed } from '../../../testing/unit-test-helper'; -import { UserFormModel } from '../../core/auth/user-form/user-form.model'; +import { configureTestBed } from '~/testing/unit-test-helper'; +import { UserFormModel } from '~/app/core/auth/user-form/user-form.model'; import { UserService } from './user.service'; describe('UserService', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/user.service.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/user.service.ts index f68250c0225..bb358925e39 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/user.service.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/user.service.ts @@ -4,7 +4,7 @@ import { Injectable } from '@angular/core'; import { Observable, of as observableOf } from 'rxjs'; import { catchError, mapTo } from 'rxjs/operators'; -import { UserFormModel } from '../../core/auth/user-form/user-form.model'; +import { UserFormModel } from '~/app/core/auth/user-form/user-form.model'; @Injectable({ providedIn: 'root' diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/classes/crush.node.selection.class.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/classes/crush.node.selection.class.spec.ts index d3bd7306b38..e09364015e5 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/classes/crush.node.selection.class.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/classes/crush.node.selection.class.spec.ts @@ -2,7 +2,7 @@ import { FormControl } from '@angular/forms'; import _ from 'lodash'; -import { configureTestBed, Mocks } from '../../../testing/unit-test-helper'; +import { configureTestBed, Mocks } from '~/testing/unit-test-helper'; import { CrushNode } from '../models/crush-node'; import { CrushNodeSelectionClass } from './crush.node.selection.class'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/alert-panel/alert-panel.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/alert-panel/alert-panel.component.spec.ts index 6b73b47c3b8..4b1f3f7ccae 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/alert-panel/alert-panel.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/alert-panel/alert-panel.component.spec.ts @@ -2,7 +2,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { NgbAlertModule } from '@ng-bootstrap/ng-bootstrap'; -import { configureTestBed } from '../../../../testing/unit-test-helper'; +import { configureTestBed } from '~/testing/unit-test-helper'; import { AlertPanelComponent } from './alert-panel.component'; describe('AlertPanelComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/alert-panel/alert-panel.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/alert-panel/alert-panel.component.ts index f72aa73c112..9d729285578 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/alert-panel/alert-panel.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/alert-panel/alert-panel.component.ts @@ -1,6 +1,6 @@ import { Component, Input, OnInit } from '@angular/core'; -import { Icons } from '../../enum/icons.enum'; +import { Icons } from '~/app/shared/enum/icons.enum'; @Component({ selector: 'cd-alert-panel', diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/back-button/back-button.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/back-button/back-button.component.spec.ts index 7b62b625683..d3120a28334 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/back-button/back-button.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/back-button/back-button.component.spec.ts @@ -1,7 +1,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; -import { configureTestBed } from '../../../../testing/unit-test-helper'; +import { configureTestBed } from '~/testing/unit-test-helper'; import { BackButtonComponent } from './back-button.component'; describe('BackButtonComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/back-button/back-button.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/back-button/back-button.component.ts index 374099ea404..1af872b8d4d 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/back-button/back-button.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/back-button/back-button.component.ts @@ -1,7 +1,7 @@ import { Location } from '@angular/common'; import { Component, Input } from '@angular/core'; -import { ActionLabelsI18n } from '../../constants/app.constants'; +import { ActionLabelsI18n } from '~/app/shared/constants/app.constants'; @Component({ selector: 'cd-back-button', diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/config-option/config-option.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/config-option/config-option.component.spec.ts index 6be0df05377..bd80388d40d 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/config-option/config-option.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/config-option/config-option.component.spec.ts @@ -6,9 +6,9 @@ import { NgbPopoverModule } from '@ng-bootstrap/ng-bootstrap'; import _ from 'lodash'; import { of as observableOf } from 'rxjs'; -import { configureTestBed } from '../../../../testing/unit-test-helper'; -import { ConfigurationService } from '../../api/configuration.service'; -import { CdFormGroup } from '../../forms/cd-form-group'; +import { configureTestBed } from '~/testing/unit-test-helper'; +import { ConfigurationService } from '~/app/shared/api/configuration.service'; +import { CdFormGroup } from '~/app/shared/forms/cd-form-group'; import { HelperComponent } from '../helper/helper.component'; import { ConfigOptionComponent } from './config-option.component'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/config-option/config-option.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/config-option/config-option.component.ts index a8bdf44e081..e50d2a41467 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/config-option/config-option.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/config-option/config-option.component.ts @@ -3,9 +3,9 @@ import { FormControl, NgForm } from '@angular/forms'; import _ from 'lodash'; -import { Icons } from '../../../shared/enum/icons.enum'; -import { ConfigurationService } from '../../api/configuration.service'; -import { CdFormGroup } from '../../forms/cd-form-group'; +import { Icons } from '~/app/shared/enum/icons.enum'; +import { ConfigurationService } from '~/app/shared/api/configuration.service'; +import { CdFormGroup } from '~/app/shared/forms/cd-form-group'; import { ConfigOptionTypes } from './config-option.types'; @Component({ diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/config-option/config-option.types.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/config-option/config-option.types.ts index 73e006fee7a..33336652cb8 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/config-option/config-option.types.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/config-option/config-option.types.ts @@ -2,7 +2,7 @@ import { Validators } from '@angular/forms'; import _ from 'lodash'; -import { CdValidators } from '../../forms/cd-validators'; +import { CdValidators } from '~/app/shared/forms/cd-validators'; import { ConfigFormModel } from './config-option.model'; export class ConfigOptionTypes { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/confirmation-modal/confirmation-modal.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/confirmation-modal/confirmation-modal.component.spec.ts index 633e4cb3121..65e69a427ae 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/confirmation-modal/confirmation-modal.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/confirmation-modal/confirmation-modal.component.spec.ts @@ -6,8 +6,8 @@ import { RouterTestingModule } from '@angular/router/testing'; import { NgbActiveModal, NgbModalModule, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; -import { configureTestBed, FixtureHelper } from '../../../../testing/unit-test-helper'; -import { ModalService } from '../../services/modal.service'; +import { configureTestBed, FixtureHelper } from '~/testing/unit-test-helper'; +import { ModalService } from '~/app/shared/services/modal.service'; import { BackButtonComponent } from '../back-button/back-button.component'; import { ModalComponent } from '../modal/modal.component'; import { SubmitButtonComponent } from '../submit-button/submit-button.component'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/critical-confirmation-modal/critical-confirmation-modal.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/critical-confirmation-modal/critical-confirmation-modal.component.spec.ts index f677e0f25ef..d61e93d16f4 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/critical-confirmation-modal/critical-confirmation-modal.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/critical-confirmation-modal/critical-confirmation-modal.component.spec.ts @@ -5,9 +5,9 @@ import { NgForm, ReactiveFormsModule } from '@angular/forms'; import { NgbActiveModal, NgbModalModule, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; import { Observable, Subscriber, timer as observableTimer } from 'rxjs'; -import { configureTestBed, modalServiceShow } from '../../../../testing/unit-test-helper'; -import { DirectivesModule } from '../../directives/directives.module'; -import { ModalService } from '../../services/modal.service'; +import { configureTestBed, modalServiceShow } from '~/testing/unit-test-helper'; +import { DirectivesModule } from '~/app/shared/directives/directives.module'; +import { ModalService } from '~/app/shared/services/modal.service'; import { AlertPanelComponent } from '../alert-panel/alert-panel.component'; import { LoadingPanelComponent } from '../loading-panel/loading-panel.component'; import { CriticalConfirmationModalComponent } from './critical-confirmation-modal.component'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/critical-confirmation-modal/critical-confirmation-modal.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/critical-confirmation-modal/critical-confirmation-modal.component.ts index a929b7dde86..4c634f8ca25 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/critical-confirmation-modal/critical-confirmation-modal.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/critical-confirmation-modal/critical-confirmation-modal.component.ts @@ -4,7 +4,7 @@ import { FormControl, Validators } from '@angular/forms'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { Observable } from 'rxjs'; -import { CdFormGroup } from '../../forms/cd-form-group'; +import { CdFormGroup } from '~/app/shared/forms/cd-form-group'; import { SubmitButtonComponent } from '../submit-button/submit-button.component'; @Component({ diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/date-time-picker/date-time-picker.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/date-time-picker/date-time-picker.component.spec.ts index c255d8c6db3..00d09e3b4d3 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/date-time-picker/date-time-picker.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/date-time-picker/date-time-picker.component.spec.ts @@ -3,7 +3,7 @@ import { FormControl, FormsModule } from '@angular/forms'; import { NgbDatepickerModule, NgbTimepickerModule } from '@ng-bootstrap/ng-bootstrap'; -import { configureTestBed } from '../../../../testing/unit-test-helper'; +import { configureTestBed } from '~/testing/unit-test-helper'; import { DateTimePickerComponent } from './date-time-picker.component'; describe('DateTimePickerComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/doc/doc.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/doc/doc.component.spec.ts index b66e63f3fe7..dd56dc5492e 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/doc/doc.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/doc/doc.component.spec.ts @@ -1,8 +1,8 @@ import { HttpClientTestingModule } from '@angular/common/http/testing'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { configureTestBed } from '../../../../testing/unit-test-helper'; -import { CephReleaseNamePipe } from '../../../shared/pipes/ceph-release-name.pipe'; +import { configureTestBed } from '~/testing/unit-test-helper'; +import { CephReleaseNamePipe } from '~/app/shared/pipes/ceph-release-name.pipe'; import { DocComponent } from './doc.component'; describe('DocComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/doc/doc.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/doc/doc.component.ts index bbf4111f9d5..6dffc360b66 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/doc/doc.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/doc/doc.component.ts @@ -1,6 +1,6 @@ import { Component, Input, OnInit } from '@angular/core'; -import { DocService } from '../../../shared/services/doc.service'; +import { DocService } from '~/app/shared/services/doc.service'; @Component({ selector: 'cd-doc', diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/download-button/download-button.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/download-button/download-button.component.spec.ts index 9814b48ac50..5ce06508b09 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/download-button/download-button.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/download-button/download-button.component.spec.ts @@ -1,7 +1,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { configureTestBed } from '../../../../testing/unit-test-helper'; -import { TextToDownloadService } from '../../services/text-to-download.service'; +import { configureTestBed } from '~/testing/unit-test-helper'; +import { TextToDownloadService } from '~/app/shared/services/text-to-download.service'; import { DownloadButtonComponent } from './download-button.component'; describe('DownloadButtonComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/download-button/download-button.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/download-button/download-button.component.ts index 491518665ba..48fde7921d5 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/download-button/download-button.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/download-button/download-button.component.ts @@ -1,7 +1,7 @@ import { Component, Input } from '@angular/core'; -import { Icons } from '../../enum/icons.enum'; -import { TextToDownloadService } from '../../services/text-to-download.service'; +import { Icons } from '~/app/shared/enum/icons.enum'; +import { TextToDownloadService } from '~/app/shared/services/text-to-download.service'; @Component({ selector: 'cd-download-button', diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/form-modal/form-modal.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/form-modal/form-modal.component.spec.ts index 986dde8de8f..a64d7d2ee3b 100755 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/form-modal/form-modal.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/form-modal/form-modal.component.spec.ts @@ -4,9 +4,9 @@ import { RouterTestingModule } from '@angular/router/testing'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; -import { configureTestBed, FixtureHelper, FormHelper } from '../../../../testing/unit-test-helper'; -import { CdValidators } from '../../forms/cd-validators'; -import { SharedModule } from '../../shared.module'; +import { configureTestBed, FixtureHelper, FormHelper } from '~/testing/unit-test-helper'; +import { CdValidators } from '~/app/shared/forms/cd-validators'; +import { SharedModule } from '~/app/shared/shared.module'; import { FormModalComponent } from './form-modal.component'; describe('InputModalComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/form-modal/form-modal.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/form-modal/form-modal.component.ts index dec43d33b63..46dd942e909 100755 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/form-modal/form-modal.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/form-modal/form-modal.component.ts @@ -4,11 +4,11 @@ import { FormControl, ValidatorFn, Validators } from '@angular/forms'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import _ from 'lodash'; -import { CdFormBuilder } from '../../forms/cd-form-builder'; -import { CdFormGroup } from '../../forms/cd-form-group'; -import { CdFormModalFieldConfig } from '../../models/cd-form-modal-field-config'; -import { DimlessBinaryPipe } from '../../pipes/dimless-binary.pipe'; -import { FormatterService } from '../../services/formatter.service'; +import { CdFormBuilder } from '~/app/shared/forms/cd-form-builder'; +import { CdFormGroup } from '~/app/shared/forms/cd-form-group'; +import { CdFormModalFieldConfig } from '~/app/shared/models/cd-form-modal-field-config'; +import { DimlessBinaryPipe } from '~/app/shared/pipes/dimless-binary.pipe'; +import { FormatterService } from '~/app/shared/services/formatter.service'; @Component({ selector: 'cd-form-modal', diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/grafana/grafana.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/grafana/grafana.component.spec.ts index f597f6074f4..95ce55ee6a2 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/grafana/grafana.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/grafana/grafana.component.spec.ts @@ -6,10 +6,10 @@ import { RouterTestingModule } from '@angular/router/testing'; import { NgbAlertModule } from '@ng-bootstrap/ng-bootstrap'; import { of } from 'rxjs'; -import { configureTestBed } from '../../../../testing/unit-test-helper'; -import { SummaryService } from '../../../shared/services/summary.service'; -import { SettingsService } from '../../api/settings.service'; -import { CephReleaseNamePipe } from '../../pipes/ceph-release-name.pipe'; +import { configureTestBed } from '~/testing/unit-test-helper'; +import { SummaryService } from '~/app/shared/services/summary.service'; +import { SettingsService } from '~/app/shared/api/settings.service'; +import { CephReleaseNamePipe } from '~/app/shared/pipes/ceph-release-name.pipe'; import { AlertPanelComponent } from '../alert-panel/alert-panel.component'; import { DocComponent } from '../doc/doc.component'; import { LoadingPanelComponent } from '../loading-panel/loading-panel.component'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/grafana/grafana.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/grafana/grafana.component.ts index aa0b979691e..dbf24295daf 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/grafana/grafana.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/grafana/grafana.component.ts @@ -1,8 +1,8 @@ import { Component, Input, OnChanges, OnInit } from '@angular/core'; import { DomSanitizer, SafeUrl } from '@angular/platform-browser'; -import { Icons } from '../../../shared/enum/icons.enum'; -import { SettingsService } from '../../api/settings.service'; +import { Icons } from '~/app/shared/enum/icons.enum'; +import { SettingsService } from '~/app/shared/api/settings.service'; @Component({ selector: 'cd-grafana', diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/helper/helper.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/helper/helper.component.spec.ts index 37adf93a3f2..a7ef4b35eb3 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/helper/helper.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/helper/helper.component.spec.ts @@ -2,7 +2,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { NgbPopoverModule } from '@ng-bootstrap/ng-bootstrap'; -import { configureTestBed } from '../../../../testing/unit-test-helper'; +import { configureTestBed } from '~/testing/unit-test-helper'; import { HelperComponent } from './helper.component'; describe('HelperComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/helper/helper.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/helper/helper.component.ts index e1f6b28f5a7..0028945ba6c 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/helper/helper.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/helper/helper.component.ts @@ -1,6 +1,6 @@ import { Component, Input } from '@angular/core'; -import { Icons } from '../../../shared/enum/icons.enum'; +import { Icons } from '~/app/shared/enum/icons.enum'; @Component({ selector: 'cd-helper', diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/language-selector/language-selector.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/language-selector/language-selector.component.spec.ts index b385db481e4..5c8334e5a68 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/language-selector/language-selector.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/language-selector/language-selector.component.spec.ts @@ -2,7 +2,7 @@ import { HttpClientTestingModule } from '@angular/common/http/testing'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { FormsModule } from '@angular/forms'; -import { configureTestBed } from '../../../../testing/unit-test-helper'; +import { configureTestBed } from '~/testing/unit-test-helper'; import { LanguageSelectorComponent } from './language-selector.component'; describe('LanguageSelectorComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/language-selector/language-selector.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/language-selector/language-selector.component.ts index 49fc02f9146..d747add207d 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/language-selector/language-selector.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/language-selector/language-selector.component.ts @@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core'; import _ from 'lodash'; -import { LanguageService } from '../../services/language.service'; +import { LanguageService } from '~/app/shared/services/language.service'; import { SupportedLanguages } from './supported-languages.enum'; @Component({ diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/loading-panel/loading-panel.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/loading-panel/loading-panel.component.spec.ts index 4ed5c4c57bf..ffc0aa57b8e 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/loading-panel/loading-panel.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/loading-panel/loading-panel.component.spec.ts @@ -2,7 +2,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { NgbAlertModule } from '@ng-bootstrap/ng-bootstrap'; -import { configureTestBed } from '../../../../testing/unit-test-helper'; +import { configureTestBed } from '~/testing/unit-test-helper'; import { LoadingPanelComponent } from './loading-panel.component'; describe('LoadingPanelComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/loading-panel/loading-panel.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/loading-panel/loading-panel.component.ts index 3d05fb9f400..61fd0190413 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/loading-panel/loading-panel.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/loading-panel/loading-panel.component.ts @@ -1,6 +1,6 @@ import { Component } from '@angular/core'; -import { Icons } from '../../../shared/enum/icons.enum'; +import { Icons } from '~/app/shared/enum/icons.enum'; @Component({ selector: 'cd-loading-panel', diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/modal/modal.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/modal/modal.component.spec.ts index 86c55beff4f..d3ee1ca2abd 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/modal/modal.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/modal/modal.component.spec.ts @@ -2,7 +2,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; -import { configureTestBed } from '../../../../testing/unit-test-helper'; +import { configureTestBed } from '~/testing/unit-test-helper'; import { ModalComponent } from './modal.component'; describe('ModalComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/notifications-sidebar/notifications-sidebar.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/notifications-sidebar/notifications-sidebar.component.spec.ts index 857595f07d0..51e673dd329 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/notifications-sidebar/notifications-sidebar.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/notifications-sidebar/notifications-sidebar.component.spec.ts @@ -8,19 +8,19 @@ import { ClickOutsideModule } from 'ng-click-outside'; import { ToastrModule } from 'ngx-toastr'; import { SimplebarAngularModule } from 'simplebar-angular'; -import { configureTestBed } from '../../../../testing/unit-test-helper'; -import { PrometheusService } from '../../api/prometheus.service'; -import { RbdService } from '../../api/rbd.service'; -import { SettingsService } from '../../api/settings.service'; -import { NotificationType } from '../../enum/notification-type.enum'; -import { ExecutingTask } from '../../models/executing-task'; -import { Permissions } from '../../models/permissions'; -import { PipesModule } from '../../pipes/pipes.module'; -import { AuthStorageService } from '../../services/auth-storage.service'; -import { NotificationService } from '../../services/notification.service'; -import { PrometheusAlertService } from '../../services/prometheus-alert.service'; -import { PrometheusNotificationService } from '../../services/prometheus-notification.service'; -import { SummaryService } from '../../services/summary.service'; +import { configureTestBed } from '~/testing/unit-test-helper'; +import { PrometheusService } from '~/app/shared/api/prometheus.service'; +import { RbdService } from '~/app/shared/api/rbd.service'; +import { SettingsService } from '~/app/shared/api/settings.service'; +import { NotificationType } from '~/app/shared/enum/notification-type.enum'; +import { ExecutingTask } from '~/app/shared/models/executing-task'; +import { Permissions } from '~/app/shared/models/permissions'; +import { PipesModule } from '~/app/shared/pipes/pipes.module'; +import { AuthStorageService } from '~/app/shared/services/auth-storage.service'; +import { NotificationService } from '~/app/shared/services/notification.service'; +import { PrometheusAlertService } from '~/app/shared/services/prometheus-alert.service'; +import { PrometheusNotificationService } from '~/app/shared/services/prometheus-notification.service'; +import { SummaryService } from '~/app/shared/services/summary.service'; import { NotificationsSidebarComponent } from './notifications-sidebar.component'; describe('NotificationsSidebarComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/notifications-sidebar/notifications-sidebar.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/notifications-sidebar/notifications-sidebar.component.ts index a334b8b77fc..8c5caf7ff6b 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/notifications-sidebar/notifications-sidebar.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/notifications-sidebar/notifications-sidebar.component.ts @@ -13,16 +13,16 @@ import _ from 'lodash'; import moment from 'moment'; import { Subscription } from 'rxjs'; -import { Icons } from '../../enum/icons.enum'; -import { CdNotification } from '../../models/cd-notification'; -import { ExecutingTask } from '../../models/executing-task'; -import { FinishedTask } from '../../models/finished-task'; -import { AuthStorageService } from '../../services/auth-storage.service'; -import { NotificationService } from '../../services/notification.service'; -import { PrometheusAlertService } from '../../services/prometheus-alert.service'; -import { PrometheusNotificationService } from '../../services/prometheus-notification.service'; -import { SummaryService } from '../../services/summary.service'; -import { TaskMessageService } from '../../services/task-message.service'; +import { Icons } from '~/app/shared/enum/icons.enum'; +import { CdNotification } from '~/app/shared/models/cd-notification'; +import { ExecutingTask } from '~/app/shared/models/executing-task'; +import { FinishedTask } from '~/app/shared/models/finished-task'; +import { AuthStorageService } from '~/app/shared/services/auth-storage.service'; +import { NotificationService } from '~/app/shared/services/notification.service'; +import { PrometheusAlertService } from '~/app/shared/services/prometheus-alert.service'; +import { PrometheusNotificationService } from '~/app/shared/services/prometheus-notification.service'; +import { SummaryService } from '~/app/shared/services/summary.service'; +import { TaskMessageService } from '~/app/shared/services/task-message.service'; @Component({ selector: 'cd-notifications-sidebar', diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/orchestrator-doc-panel/orchestrator-doc-panel.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/orchestrator-doc-panel/orchestrator-doc-panel.component.spec.ts index 27b42fa707e..56a77e5519b 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/orchestrator-doc-panel/orchestrator-doc-panel.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/orchestrator-doc-panel/orchestrator-doc-panel.component.spec.ts @@ -2,9 +2,9 @@ import { HttpClientTestingModule } from '@angular/common/http/testing'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; -import { configureTestBed } from '../../../../testing/unit-test-helper'; -import { CephReleaseNamePipe } from '../../pipes/ceph-release-name.pipe'; -import { SummaryService } from '../../services/summary.service'; +import { configureTestBed } from '~/testing/unit-test-helper'; +import { CephReleaseNamePipe } from '~/app/shared/pipes/ceph-release-name.pipe'; +import { SummaryService } from '~/app/shared/services/summary.service'; import { ComponentsModule } from '../components.module'; import { OrchestratorDocPanelComponent } from './orchestrator-doc-panel.component'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/orchestrator-doc-panel/orchestrator-doc-panel.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/orchestrator-doc-panel/orchestrator-doc-panel.component.ts index 946f7efa88a..d5bc36ad67e 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/orchestrator-doc-panel/orchestrator-doc-panel.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/orchestrator-doc-panel/orchestrator-doc-panel.component.ts @@ -1,6 +1,6 @@ import { Component, Input } from '@angular/core'; -import { OrchestratorFeature } from '../../models/orchestrator.enum'; +import { OrchestratorFeature } from '~/app/shared/models/orchestrator.enum'; @Component({ selector: 'cd-orchestrator-doc-panel', diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/pwd-expiration-notification/pwd-expiration-notification.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/pwd-expiration-notification/pwd-expiration-notification.component.spec.ts index 63f59601f50..0b515efcd88 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/pwd-expiration-notification/pwd-expiration-notification.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/pwd-expiration-notification/pwd-expiration-notification.component.spec.ts @@ -7,9 +7,9 @@ import { RouterTestingModule } from '@angular/router/testing'; import { NgbAlertModule } from '@ng-bootstrap/ng-bootstrap'; import { of as observableOf } from 'rxjs'; -import { configureTestBed } from '../../../../testing/unit-test-helper'; -import { SettingsService } from '../../api/settings.service'; -import { AuthStorageService } from '../../services/auth-storage.service'; +import { configureTestBed } from '~/testing/unit-test-helper'; +import { SettingsService } from '~/app/shared/api/settings.service'; +import { AuthStorageService } from '~/app/shared/services/auth-storage.service'; import { PwdExpirationNotificationComponent } from './pwd-expiration-notification.component'; describe('PwdExpirationNotificationComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/pwd-expiration-notification/pwd-expiration-notification.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/pwd-expiration-notification/pwd-expiration-notification.component.ts index c713d4c7b6d..a894637ef68 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/pwd-expiration-notification/pwd-expiration-notification.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/pwd-expiration-notification/pwd-expiration-notification.component.ts @@ -1,8 +1,8 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; -import { SettingsService } from '../../api/settings.service'; -import { CdPwdExpirationSettings } from '../../models/cd-pwd-expiration-settings'; -import { AuthStorageService } from '../../services/auth-storage.service'; +import { SettingsService } from '~/app/shared/api/settings.service'; +import { CdPwdExpirationSettings } from '~/app/shared/models/cd-pwd-expiration-settings'; +import { AuthStorageService } from '~/app/shared/services/auth-storage.service'; @Component({ selector: 'cd-pwd-expiration-notification', diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/refresh-selector/refresh-selector.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/refresh-selector/refresh-selector.component.spec.ts index b8a438b3e4d..acfe49cef48 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/refresh-selector/refresh-selector.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/refresh-selector/refresh-selector.component.spec.ts @@ -1,8 +1,8 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { FormsModule } from '@angular/forms'; -import { configureTestBed } from '../../../../testing/unit-test-helper'; -import { RefreshIntervalService } from '../../services/refresh-interval.service'; +import { configureTestBed } from '~/testing/unit-test-helper'; +import { RefreshIntervalService } from '~/app/shared/services/refresh-interval.service'; import { RefreshSelectorComponent } from './refresh-selector.component'; describe('RefreshSelectorComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/refresh-selector/refresh-selector.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/refresh-selector/refresh-selector.component.ts index 632ddf6fd89..080890e2693 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/refresh-selector/refresh-selector.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/refresh-selector/refresh-selector.component.ts @@ -1,6 +1,6 @@ import { Component, OnInit } from '@angular/core'; -import { RefreshIntervalService } from '../../services/refresh-interval.service'; +import { RefreshIntervalService } from '~/app/shared/services/refresh-interval.service'; @Component({ selector: 'cd-refresh-selector', diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/select-badges/select-badges.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/select-badges/select-badges.component.spec.ts index c71d058fb04..ac7323b73c4 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/select-badges/select-badges.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/select-badges/select-badges.component.spec.ts @@ -3,7 +3,7 @@ import { ReactiveFormsModule, Validators } from '@angular/forms'; import { NgbPopoverModule, NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap'; -import { configureTestBed } from '../../../../testing/unit-test-helper'; +import { configureTestBed } from '~/testing/unit-test-helper'; import { SelectMessages } from '../select/select-messages.model'; import { SelectComponent } from '../select/select.component'; import { SelectBadgesComponent } from './select-badges.component'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/select-badges/select-badges.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/select-badges/select-badges.component.ts index 17d05ed4b48..b44ecd7e49d 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/select-badges/select-badges.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/select-badges/select-badges.component.ts @@ -1,7 +1,7 @@ import { Component, EventEmitter, Input, Output, ViewChild } from '@angular/core'; import { ValidatorFn } from '@angular/forms'; -import { Icons } from '../../../shared/enum/icons.enum'; +import { Icons } from '~/app/shared/enum/icons.enum'; import { SelectMessages } from '../select/select-messages.model'; import { SelectOption } from '../select/select-option.model'; import { SelectComponent } from '../select/select.component'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/select/select.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/select/select.component.spec.ts index 4d1e78624e7..c35ec909125 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/select/select.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/select/select.component.spec.ts @@ -3,7 +3,7 @@ import { ReactiveFormsModule, Validators } from '@angular/forms'; import { NgbPopoverModule, NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap'; -import { configureTestBed } from '../../../../testing/unit-test-helper'; +import { configureTestBed } from '~/testing/unit-test-helper'; import { SelectOption } from './select-option.model'; import { SelectComponent } from './select.component'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/select/select.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/select/select.component.ts index b303af4c138..3ff19fe04c2 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/select/select.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/select/select.component.ts @@ -3,8 +3,8 @@ import { FormControl, ValidatorFn } from '@angular/forms'; import _ from 'lodash'; -import { Icons } from '../../../shared/enum/icons.enum'; -import { CdFormGroup } from '../../forms/cd-form-group'; +import { Icons } from '~/app/shared/enum/icons.enum'; +import { CdFormGroup } from '~/app/shared/forms/cd-form-group'; import { SelectMessages } from './select-messages.model'; import { SelectOption } from './select-option.model'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/sparkline/sparkline.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/sparkline/sparkline.component.spec.ts index 484770b0905..e0563c1c241 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/sparkline/sparkline.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/sparkline/sparkline.component.spec.ts @@ -1,9 +1,9 @@ import { NO_ERRORS_SCHEMA, SimpleChange } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { configureTestBed } from '../../../../testing/unit-test-helper'; -import { DimlessBinaryPipe } from '../../pipes/dimless-binary.pipe'; -import { FormatterService } from '../../services/formatter.service'; +import { configureTestBed } from '~/testing/unit-test-helper'; +import { DimlessBinaryPipe } from '~/app/shared/pipes/dimless-binary.pipe'; +import { FormatterService } from '~/app/shared/services/formatter.service'; import { SparklineComponent } from './sparkline.component'; describe('SparklineComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/sparkline/sparkline.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/sparkline/sparkline.component.ts index ce9e9968f43..e2f5af5e0f9 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/sparkline/sparkline.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/sparkline/sparkline.component.ts @@ -8,8 +8,8 @@ import { ViewChild } from '@angular/core'; -import { ChartTooltip } from '../../models/chart-tooltip'; -import { DimlessBinaryPipe } from '../../pipes/dimless-binary.pipe'; +import { ChartTooltip } from '~/app/shared/models/chart-tooltip'; +import { DimlessBinaryPipe } from '~/app/shared/pipes/dimless-binary.pipe'; @Component({ selector: 'cd-sparkline', diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/submit-button/submit-button.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/submit-button/submit-button.component.spec.ts index 795637a5ee1..a7b7023d025 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/submit-button/submit-button.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/submit-button/submit-button.component.spec.ts @@ -1,7 +1,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { FormGroup } from '@angular/forms'; -import { configureTestBed } from '../../../../testing/unit-test-helper'; +import { configureTestBed } from '~/testing/unit-test-helper'; import { SubmitButtonComponent } from './submit-button.component'; describe('SubmitButtonComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/submit-button/submit-button.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/submit-button/submit-button.component.ts index ad4d6094aff..6cd273bcf4e 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/submit-button/submit-button.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/submit-button/submit-button.component.ts @@ -3,7 +3,7 @@ import { AbstractControl, FormGroup, FormGroupDirective, NgForm } from '@angular import _ from 'lodash'; -import { Icons } from '../../../shared/enum/icons.enum'; +import { Icons } from '~/app/shared/enum/icons.enum'; /** * This component will render a submit button with the given label. diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/telemetry-notification/telemetry-notification.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/telemetry-notification/telemetry-notification.component.spec.ts index 8029221f9fe..c5cd365b602 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/telemetry-notification/telemetry-notification.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/telemetry-notification/telemetry-notification.component.spec.ts @@ -5,14 +5,14 @@ import { NgbAlertModule } from '@ng-bootstrap/ng-bootstrap'; import { ToastrModule } from 'ngx-toastr'; import { of } from 'rxjs'; -import { configureTestBed } from '../../../../testing/unit-test-helper'; -import { MgrModuleService } from '../../api/mgr-module.service'; -import { UserService } from '../../api/user.service'; -import { Permissions } from '../../models/permissions'; -import { PipesModule } from '../../pipes/pipes.module'; -import { AuthStorageService } from '../../services/auth-storage.service'; -import { NotificationService } from '../../services/notification.service'; -import { TelemetryNotificationService } from '../../services/telemetry-notification.service'; +import { configureTestBed } from '~/testing/unit-test-helper'; +import { MgrModuleService } from '~/app/shared/api/mgr-module.service'; +import { UserService } from '~/app/shared/api/user.service'; +import { Permissions } from '~/app/shared/models/permissions'; +import { PipesModule } from '~/app/shared/pipes/pipes.module'; +import { AuthStorageService } from '~/app/shared/services/auth-storage.service'; +import { NotificationService } from '~/app/shared/services/notification.service'; +import { TelemetryNotificationService } from '~/app/shared/services/telemetry-notification.service'; import { TelemetryNotificationComponent } from './telemetry-notification.component'; describe('TelemetryActivationNotificationComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/telemetry-notification/telemetry-notification.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/telemetry-notification/telemetry-notification.component.ts index da0f6b11820..85218902003 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/telemetry-notification/telemetry-notification.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/telemetry-notification/telemetry-notification.component.ts @@ -2,11 +2,11 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; import _ from 'lodash'; -import { MgrModuleService } from '../../api/mgr-module.service'; -import { NotificationType } from '../../enum/notification-type.enum'; -import { AuthStorageService } from '../../services/auth-storage.service'; -import { NotificationService } from '../../services/notification.service'; -import { TelemetryNotificationService } from '../../services/telemetry-notification.service'; +import { MgrModuleService } from '~/app/shared/api/mgr-module.service'; +import { NotificationType } from '~/app/shared/enum/notification-type.enum'; +import { AuthStorageService } from '~/app/shared/services/auth-storage.service'; +import { NotificationService } from '~/app/shared/services/notification.service'; +import { TelemetryNotificationService } from '~/app/shared/services/telemetry-notification.service'; @Component({ selector: 'cd-telemetry-notification', diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/usage-bar/usage-bar.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/usage-bar/usage-bar.component.spec.ts index 2cc510b9d41..4a893cf4a93 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/usage-bar/usage-bar.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/usage-bar/usage-bar.component.spec.ts @@ -2,8 +2,8 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap'; -import { configureTestBed } from '../../../../testing/unit-test-helper'; -import { PipesModule } from '../../pipes/pipes.module'; +import { configureTestBed } from '~/testing/unit-test-helper'; +import { PipesModule } from '~/app/shared/pipes/pipes.module'; import { UsageBarComponent } from './usage-bar.component'; describe('UsageBarComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table-actions/table-actions.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table-actions/table-actions.component.spec.ts index e7b2b73ee6a..ca9465f3bfa 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table-actions/table-actions.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table-actions/table-actions.component.spec.ts @@ -1,11 +1,11 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; -import { configureTestBed, PermissionHelper } from '../../../../testing/unit-test-helper'; -import { ComponentsModule } from '../../components/components.module'; -import { CdTableAction } from '../../models/cd-table-action'; -import { CdTableSelection } from '../../models/cd-table-selection'; -import { Permission } from '../../models/permissions'; +import { configureTestBed, PermissionHelper } from '~/testing/unit-test-helper'; +import { ComponentsModule } from '~/app/shared/components/components.module'; +import { CdTableAction } from '~/app/shared/models/cd-table-action'; +import { CdTableSelection } from '~/app/shared/models/cd-table-selection'; +import { Permission } from '~/app/shared/models/permissions'; import { TableActionsComponent } from './table-actions.component'; describe('TableActionsComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table-actions/table-actions.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table-actions/table-actions.component.ts index a6f30a066d3..fc951233ac4 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table-actions/table-actions.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table-actions/table-actions.component.ts @@ -2,10 +2,10 @@ import { Component, Input, OnInit } from '@angular/core'; import _ from 'lodash'; -import { Icons } from '../../../shared/enum/icons.enum'; -import { CdTableAction } from '../../models/cd-table-action'; -import { CdTableSelection } from '../../models/cd-table-selection'; -import { Permission } from '../../models/permissions'; +import { Icons } from '~/app/shared/enum/icons.enum'; +import { CdTableAction } from '~/app/shared/models/cd-table-action'; +import { CdTableSelection } from '~/app/shared/models/cd-table-selection'; +import { Permission } from '~/app/shared/models/permissions'; @Component({ selector: 'cd-table-actions', diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table-key-value/table-key-value.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table-key-value/table-key-value.component.spec.ts index 0ed31b78836..df0bcf6def3 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table-key-value/table-key-value.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table-key-value/table-key-value.component.spec.ts @@ -5,12 +5,12 @@ import { RouterTestingModule } from '@angular/router/testing'; import { NgbDropdownModule, NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap'; import { NgxDatatableModule } from '@swimlane/ngx-datatable'; -import { configureTestBed } from '../../../../testing/unit-test-helper'; -import { ComponentsModule } from '../../components/components.module'; -import { CellTemplate } from '../../enum/cell-template.enum'; -import { CdTableColumn } from '../../models/cd-table-column'; -import { CdDatePipe } from '../../pipes/cd-date.pipe'; -import { PipesModule } from '../../pipes/pipes.module'; +import { configureTestBed } from '~/testing/unit-test-helper'; +import { ComponentsModule } from '~/app/shared/components/components.module'; +import { CellTemplate } from '~/app/shared/enum/cell-template.enum'; +import { CdTableColumn } from '~/app/shared/models/cd-table-column'; +import { CdDatePipe } from '~/app/shared/pipes/cd-date.pipe'; +import { PipesModule } from '~/app/shared/pipes/pipes.module'; import { TableComponent } from '../table/table.component'; import { TableKeyValueComponent } from './table-key-value.component'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table-key-value/table-key-value.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table-key-value/table-key-value.component.ts index dd48a431bed..0f450ce2a57 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table-key-value/table-key-value.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table-key-value/table-key-value.component.ts @@ -10,9 +10,9 @@ import { import _ from 'lodash'; -import { CellTemplate } from '../../enum/cell-template.enum'; -import { CdTableColumn } from '../../models/cd-table-column'; -import { CdDatePipe } from '../../pipes/cd-date.pipe'; +import { CellTemplate } from '~/app/shared/enum/cell-template.enum'; +import { CdTableColumn } from '~/app/shared/models/cd-table-column'; +import { CdDatePipe } from '~/app/shared/pipes/cd-date.pipe'; import { TableComponent } from '../table/table.component'; interface KeyValueItem { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table/table.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table/table.component.spec.ts index 7c4623fdc67..f94b3c6dc7c 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table/table.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table/table.component.spec.ts @@ -7,12 +7,12 @@ import { NgbDropdownModule, NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap' import { NgxDatatableModule } from '@swimlane/ngx-datatable'; import _ from 'lodash'; -import { configureTestBed } from '../../../../testing/unit-test-helper'; -import { ComponentsModule } from '../../components/components.module'; -import { CdTableColumnFilter } from '../../models/cd-table-column-filter'; -import { CdTableFetchDataContext } from '../../models/cd-table-fetch-data-context'; -import { CdTableSelection } from '../../models/cd-table-selection'; -import { PipesModule } from '../../pipes/pipes.module'; +import { configureTestBed } from '~/testing/unit-test-helper'; +import { ComponentsModule } from '~/app/shared/components/components.module'; +import { CdTableColumnFilter } from '~/app/shared/models/cd-table-column-filter'; +import { CdTableFetchDataContext } from '~/app/shared/models/cd-table-fetch-data-context'; +import { CdTableSelection } from '~/app/shared/models/cd-table-selection'; +import { PipesModule } from '~/app/shared/pipes/pipes.module'; import { TableComponent } from './table.component'; describe('TableComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table/table.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table/table.component.ts index 664d93e1523..6f011dcc2bc 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table/table.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table/table.component.ts @@ -26,15 +26,15 @@ import { import _ from 'lodash'; import { Observable, Subject, Subscription, timer as observableTimer } from 'rxjs'; -import { TableStatus } from '../../../shared/classes/table-status'; -import { Icons } from '../../../shared/enum/icons.enum'; -import { CellTemplate } from '../../enum/cell-template.enum'; -import { CdTableColumn } from '../../models/cd-table-column'; -import { CdTableColumnFilter } from '../../models/cd-table-column-filter'; -import { CdTableColumnFiltersChange } from '../../models/cd-table-column-filters-change'; -import { CdTableFetchDataContext } from '../../models/cd-table-fetch-data-context'; -import { CdTableSelection } from '../../models/cd-table-selection'; -import { CdUserConfig } from '../../models/cd-user-config'; +import { TableStatus } from '~/app/shared/classes/table-status'; +import { Icons } from '~/app/shared/enum/icons.enum'; +import { CellTemplate } from '~/app/shared/enum/cell-template.enum'; +import { CdTableColumn } from '~/app/shared/models/cd-table-column'; +import { CdTableColumnFilter } from '~/app/shared/models/cd-table-column-filter'; +import { CdTableColumnFiltersChange } from '~/app/shared/models/cd-table-column-filters-change'; +import { CdTableFetchDataContext } from '~/app/shared/models/cd-table-fetch-data-context'; +import { CdTableSelection } from '~/app/shared/models/cd-table-selection'; +import { CdUserConfig } from '~/app/shared/models/cd-user-config'; @Component({ selector: 'cd-table', diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/directives/autofocus.directive.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/directives/autofocus.directive.spec.ts index e13df747ac7..9ef2078ec0c 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/directives/autofocus.directive.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/directives/autofocus.directive.spec.ts @@ -2,7 +2,7 @@ import { Component } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; -import { configureTestBed } from '../../../testing/unit-test-helper'; +import { configureTestBed } from '~/testing/unit-test-helper'; import { AutofocusDirective } from './autofocus.directive'; @Component({ diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/directives/copy2clipboard-button.directive.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/directives/copy2clipboard-button.directive.spec.ts index 1b31727fcce..b9681a95a2a 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/directives/copy2clipboard-button.directive.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/directives/copy2clipboard-button.directive.spec.ts @@ -3,7 +3,7 @@ import { TestBed } from '@angular/core/testing'; import * as BrowserDetect from 'detect-browser'; import { ToastrService } from 'ngx-toastr'; -import { configureTestBed } from '../../../testing/unit-test-helper'; +import { configureTestBed } from '~/testing/unit-test-helper'; import { Copy2ClipboardButtonDirective } from './copy2clipboard-button.directive'; describe('Copy2clipboardButtonDirective', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/directives/form-input-disable.directive.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/directives/form-input-disable.directive.spec.ts index 0aca1404a41..a79043b78fc 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/directives/form-input-disable.directive.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/directives/form-input-disable.directive.spec.ts @@ -2,7 +2,7 @@ import { Component, DebugElement, Input } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; -import { configureTestBed } from '../../../testing/unit-test-helper'; +import { configureTestBed } from '~/testing/unit-test-helper'; import { Permission } from '../models/permissions'; import { AuthStorageService } from '../services/auth-storage.service'; import { FormInputDisableDirective } from './form-input-disable.directive'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/directives/form-loading.directive.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/directives/form-loading.directive.spec.ts index ed9299124ae..8bc3b05a291 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/directives/form-loading.directive.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/directives/form-loading.directive.spec.ts @@ -4,7 +4,7 @@ import { By } from '@angular/platform-browser'; import { NgbAlertModule } from '@ng-bootstrap/ng-bootstrap'; -import { configureTestBed } from '../../../testing/unit-test-helper'; +import { configureTestBed } from '~/testing/unit-test-helper'; import { AlertPanelComponent } from '../components/alert-panel/alert-panel.component'; import { LoadingPanelComponent } from '../components/loading-panel/loading-panel.component'; import { CdForm } from '../forms/cd-form'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/directives/trim.directive.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/directives/trim.directive.spec.ts index db5e394034b..daef6b3c815 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/directives/trim.directive.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/directives/trim.directive.spec.ts @@ -3,7 +3,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { FormControl, FormsModule, ReactiveFormsModule } from '@angular/forms'; import { By } from '@angular/platform-browser'; -import { configureTestBed } from '../../../testing/unit-test-helper'; +import { configureTestBed } from '~/testing/unit-test-helper'; import { CdFormGroup } from '../forms/cd-form-group'; import { TrimDirective } from './trim.directive'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/enum/color.enum.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/enum/color.enum.ts index 881cc012f35..832eaf2bdc1 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/enum/color.enum.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/enum/color.enum.ts @@ -1,4 +1,4 @@ -import styles from '../../../styles.scss'; +import styles from '~/styles.scss'; export class Color { // HEALTH diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/forms/cd-validators.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/forms/cd-validators.spec.ts index 7af3890913d..557a179cc5a 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/forms/cd-validators.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/forms/cd-validators.spec.ts @@ -3,7 +3,7 @@ import { FormControl, Validators } from '@angular/forms'; import { of as observableOf } from 'rxjs'; -import { FormHelper } from '../../../testing/unit-test-helper'; +import { FormHelper } from '~/testing/unit-test-helper'; import { CdFormGroup } from './cd-form-group'; import { CdValidators } from './cd-validators'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/pipes/health-color.pipe.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/pipes/health-color.pipe.spec.ts index 471a877031b..0039cf90eb7 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/pipes/health-color.pipe.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/pipes/health-color.pipe.spec.ts @@ -1,4 +1,4 @@ -import styles from '../../../styles.scss'; +import styles from '~/styles.scss'; import { HealthColorPipe } from './health-color.pipe'; describe('HealthColorPipe', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/services/api-interceptor.service.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/services/api-interceptor.service.spec.ts index 2b37ffafaa3..fa3d981cca8 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/services/api-interceptor.service.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/services/api-interceptor.service.spec.ts @@ -5,8 +5,8 @@ import { Router } from '@angular/router'; import { ToastrService } from 'ngx-toastr'; -import { configureTestBed } from '../../../testing/unit-test-helper'; -import { AppModule } from '../../app.module'; +import { configureTestBed } from '~/testing/unit-test-helper'; +import { AppModule } from '~/app/app.module'; import { NotificationType } from '../enum/notification-type.enum'; import { CdNotification, CdNotificationConfig } from '../models/cd-notification'; import { ApiInterceptorService } from './api-interceptor.service'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/services/auth-guard.service.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/services/auth-guard.service.spec.ts index 69100ad489f..22a6e813979 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/services/auth-guard.service.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/services/auth-guard.service.spec.ts @@ -3,7 +3,7 @@ import { fakeAsync, TestBed, tick } from '@angular/core/testing'; import { ActivatedRouteSnapshot, Router, RouterStateSnapshot, Routes } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; -import { configureTestBed } from '../../../testing/unit-test-helper'; +import { configureTestBed } from '~/testing/unit-test-helper'; import { AuthGuardService } from './auth-guard.service'; import { AuthStorageService } from './auth-storage.service'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/services/change-password-guard.service.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/services/change-password-guard.service.spec.ts index a31e79c373c..5bc8d751fd4 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/services/change-password-guard.service.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/services/change-password-guard.service.spec.ts @@ -3,7 +3,7 @@ import { fakeAsync, TestBed, tick } from '@angular/core/testing'; import { Router, Routes } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; -import { configureTestBed } from '../../../testing/unit-test-helper'; +import { configureTestBed } from '~/testing/unit-test-helper'; import { AuthStorageService } from './auth-storage.service'; import { ChangePasswordGuardService } from './change-password-guard.service'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/services/doc.service.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/services/doc.service.spec.ts index 09fab0c7e05..5694998ace4 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/services/doc.service.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/services/doc.service.spec.ts @@ -3,7 +3,7 @@ import { TestBed } from '@angular/core/testing'; import { Subscriber } from 'rxjs'; -import { configureTestBed } from '../../../testing/unit-test-helper'; +import { configureTestBed } from '~/testing/unit-test-helper'; import { SharedModule } from '../shared.module'; import { DocService } from './doc.service'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/services/favicon.service.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/services/favicon.service.spec.ts index 7c7184e5abb..f55bad43835 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/services/favicon.service.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/services/favicon.service.spec.ts @@ -1,7 +1,7 @@ import { HttpClientTestingModule } from '@angular/common/http/testing'; import { TestBed } from '@angular/core/testing'; -import { configureTestBed } from '../../../testing/unit-test-helper'; +import { configureTestBed } from '~/testing/unit-test-helper'; import { FaviconService } from './favicon.service'; describe('FaviconService', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/services/feature-toggles-guard.service.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/services/feature-toggles-guard.service.spec.ts index 06db9040444..d657f26b1e6 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/services/feature-toggles-guard.service.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/services/feature-toggles-guard.service.spec.ts @@ -5,7 +5,7 @@ import { RouterTestingModule } from '@angular/router/testing'; import { of as observableOf } from 'rxjs'; -import { configureTestBed } from '../../../testing/unit-test-helper'; +import { configureTestBed } from '~/testing/unit-test-helper'; import { FeatureTogglesGuardService } from './feature-toggles-guard.service'; import { FeatureTogglesService } from './feature-toggles.service'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/services/feature-toggles.service.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/services/feature-toggles.service.spec.ts index 1b888b8179d..ddb8888512a 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/services/feature-toggles.service.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/services/feature-toggles.service.spec.ts @@ -1,7 +1,7 @@ import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; import { discardPeriodicTasks, fakeAsync, TestBed, tick } from '@angular/core/testing'; -import { configureTestBed } from '../../../testing/unit-test-helper'; +import { configureTestBed } from '~/testing/unit-test-helper'; import { FeatureTogglesService } from './feature-toggles.service'; describe('FeatureTogglesService', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/services/formatter.service.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/services/formatter.service.spec.ts index b0c1860dcdb..359c6028a59 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/services/formatter.service.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/services/formatter.service.spec.ts @@ -1,4 +1,4 @@ -import { configureTestBed } from '../../../testing/unit-test-helper'; +import { configureTestBed } from '~/testing/unit-test-helper'; import { DimlessBinaryPipe } from '../pipes/dimless-binary.pipe'; import { DimlessPipe } from '../pipes/dimless.pipe'; import { FormatterService } from './formatter.service'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/services/language.service.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/services/language.service.spec.ts index f2fa0bf196b..dacff44f083 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/services/language.service.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/services/language.service.spec.ts @@ -1,7 +1,7 @@ import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; import { TestBed } from '@angular/core/testing'; -import { configureTestBed } from '../../../testing/unit-test-helper'; +import { configureTestBed } from '~/testing/unit-test-helper'; import { LanguageService } from './language.service'; describe('LanguageService', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/services/language.service.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/services/language.service.ts index bdb26d2df2b..d2705ee3604 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/services/language.service.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/services/language.service.ts @@ -1,7 +1,7 @@ import { HttpClient } from '@angular/common/http'; import { Inject, Injectable, LOCALE_ID } from '@angular/core'; -import { environment } from '../../../environments/environment'; +import { environment } from '~/environments/environment'; @Injectable({ providedIn: 'root' diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/services/modal.service.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/services/modal.service.spec.ts index 2fb07e14b56..4e5ed061d83 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/services/modal.service.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/services/modal.service.spec.ts @@ -3,7 +3,7 @@ import { fakeAsync, TestBed, tick } from '@angular/core/testing'; import { NgbActiveModal, NgbModal, NgbModalModule } from '@ng-bootstrap/ng-bootstrap'; -import { configureTestBed } from '../../../testing/unit-test-helper'; +import { configureTestBed } from '~/testing/unit-test-helper'; import { ModalService } from './modal.service'; @Component({ diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/services/module-status-guard.service.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/services/module-status-guard.service.spec.ts index 66d0e1bd7db..cdaae28af38 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/services/module-status-guard.service.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/services/module-status-guard.service.spec.ts @@ -6,7 +6,7 @@ import { RouterTestingModule } from '@angular/router/testing'; import { of as observableOf } from 'rxjs'; -import { configureTestBed } from '../../../testing/unit-test-helper'; +import { configureTestBed } from '~/testing/unit-test-helper'; import { ModuleStatusGuardService } from './module-status-guard.service'; describe('ModuleStatusGuardService', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/services/no-sso-guard.service.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/services/no-sso-guard.service.spec.ts index d50b957dd85..1d2c0833624 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/services/no-sso-guard.service.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/services/no-sso-guard.service.spec.ts @@ -3,7 +3,7 @@ import { fakeAsync, TestBed, tick } from '@angular/core/testing'; import { Router, Routes } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; -import { configureTestBed } from '../../../testing/unit-test-helper'; +import { configureTestBed } from '~/testing/unit-test-helper'; import { AuthStorageService } from './auth-storage.service'; import { NoSsoGuardService } from './no-sso-guard.service'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/services/notification.service.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/services/notification.service.spec.ts index 52700dab7de..028dd90ea39 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/services/notification.service.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/services/notification.service.spec.ts @@ -4,7 +4,7 @@ import { fakeAsync, TestBed, tick } from '@angular/core/testing'; import _ from 'lodash'; import { ToastrService } from 'ngx-toastr'; -import { configureTestBed } from '../../../testing/unit-test-helper'; +import { configureTestBed } from '~/testing/unit-test-helper'; import { RbdService } from '../api/rbd.service'; import { NotificationType } from '../enum/notification-type.enum'; import { CdNotificationConfig } from '../models/cd-notification'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/services/password-policy.service.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/services/password-policy.service.spec.ts index ff88fcb6206..2925b152b89 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/services/password-policy.service.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/services/password-policy.service.spec.ts @@ -3,7 +3,7 @@ import { TestBed } from '@angular/core/testing'; import { of as observableOf } from 'rxjs'; -import { configureTestBed } from '../../../testing/unit-test-helper'; +import { configureTestBed } from '~/testing/unit-test-helper'; import { SettingsService } from '../api/settings.service'; import { SharedModule } from '../shared.module'; import { PasswordPolicyService } from './password-policy.service'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/services/prometheus-alert-formatter.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/services/prometheus-alert-formatter.spec.ts index c4ffc5e8444..8ee698ff524 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/services/prometheus-alert-formatter.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/services/prometheus-alert-formatter.spec.ts @@ -3,7 +3,7 @@ import { TestBed } from '@angular/core/testing'; import { ToastrModule } from 'ngx-toastr'; -import { configureTestBed, PrometheusHelper } from '../../../testing/unit-test-helper'; +import { configureTestBed, PrometheusHelper } from '~/testing/unit-test-helper'; import { NotificationType } from '../enum/notification-type.enum'; import { CdNotificationConfig } from '../models/cd-notification'; import { PrometheusCustomAlert } from '../models/prometheus-alerts'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/services/prometheus-alert-formatter.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/services/prometheus-alert-formatter.ts index f7dbd1e564e..9af9ce18c7f 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/services/prometheus-alert-formatter.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/services/prometheus-alert-formatter.ts @@ -2,7 +2,7 @@ import { Injectable } from '@angular/core'; import _ from 'lodash'; -import { Icons } from '../../shared/enum/icons.enum'; +import { Icons } from '../enum/icons.enum'; import { NotificationType } from '../enum/notification-type.enum'; import { CdNotificationConfig } from '../models/cd-notification'; import { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/services/prometheus-alert.service.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/services/prometheus-alert.service.spec.ts index eaca61b48a3..1c4ac57441c 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/services/prometheus-alert.service.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/services/prometheus-alert.service.spec.ts @@ -4,7 +4,7 @@ import { TestBed } from '@angular/core/testing'; import { ToastrModule } from 'ngx-toastr'; import { Observable, of } from 'rxjs'; -import { configureTestBed, PrometheusHelper } from '../../../testing/unit-test-helper'; +import { configureTestBed, PrometheusHelper } from '~/testing/unit-test-helper'; import { PrometheusService } from '../api/prometheus.service'; import { NotificationType } from '../enum/notification-type.enum'; import { CdNotificationConfig } from '../models/cd-notification'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/services/prometheus-notification.service.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/services/prometheus-notification.service.spec.ts index 6500d51f26a..4fb2bbbb993 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/services/prometheus-notification.service.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/services/prometheus-notification.service.spec.ts @@ -4,7 +4,7 @@ import { fakeAsync, TestBed, tick } from '@angular/core/testing'; import { ToastrModule, ToastrService } from 'ngx-toastr'; import { of, throwError } from 'rxjs'; -import { configureTestBed, PrometheusHelper } from '../../../testing/unit-test-helper'; +import { configureTestBed, PrometheusHelper } from '~/testing/unit-test-helper'; import { PrometheusService } from '../api/prometheus.service'; import { NotificationType } from '../enum/notification-type.enum'; import { CdNotificationConfig } from '../models/cd-notification'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/services/prometheus-silence-matcher.service.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/services/prometheus-silence-matcher.service.spec.ts index 57f0442c43f..92ff6baa785 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/services/prometheus-silence-matcher.service.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/services/prometheus-silence-matcher.service.spec.ts @@ -1,6 +1,6 @@ import { TestBed } from '@angular/core/testing'; -import { configureTestBed, PrometheusHelper } from '../../../testing/unit-test-helper'; +import { configureTestBed, PrometheusHelper } from '~/testing/unit-test-helper'; import { PrometheusRule } from '../models/prometheus-alerts'; import { SharedModule } from '../shared.module'; import { PrometheusSilenceMatcherService } from './prometheus-silence-matcher.service'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/services/rbd-configuration.service.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/services/rbd-configuration.service.spec.ts index 15b2e4e7e14..b119f5d6302 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/services/rbd-configuration.service.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/services/rbd-configuration.service.spec.ts @@ -1,6 +1,6 @@ import { TestBed } from '@angular/core/testing'; -import { configureTestBed } from '../../../testing/unit-test-helper'; +import { configureTestBed } from '~/testing/unit-test-helper'; import { RbdConfigurationType } from '../models/configuration'; import { RbdConfigurationService } from './rbd-configuration.service'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/services/refresh-interval.service.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/services/refresh-interval.service.spec.ts index 51be8659137..c26d6389be6 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/services/refresh-interval.service.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/services/refresh-interval.service.spec.ts @@ -1,7 +1,7 @@ import { NgZone } from '@angular/core'; import { fakeAsync, TestBed, tick } from '@angular/core/testing'; -import { configureTestBed } from '../../../testing/unit-test-helper'; +import { configureTestBed } from '~/testing/unit-test-helper'; import { RefreshIntervalService } from './refresh-interval.service'; describe('RefreshIntervalService', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/services/summary.service.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/services/summary.service.spec.ts index 8b851700206..5369a578d4c 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/services/summary.service.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/services/summary.service.spec.ts @@ -4,7 +4,7 @@ import { RouterTestingModule } from '@angular/router/testing'; import { of as observableOf, Subscriber, Subscription } from 'rxjs'; -import { configureTestBed } from '../../../testing/unit-test-helper'; +import { configureTestBed } from '~/testing/unit-test-helper'; import { ExecutingTask } from '../models/executing-task'; import { Summary } from '../models/summary.model'; import { AuthStorageService } from './auth-storage.service'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/services/task-list.service.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/services/task-list.service.spec.ts index 5ec08671eca..66aad3cffdb 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/services/task-list.service.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/services/task-list.service.spec.ts @@ -4,7 +4,7 @@ import { RouterTestingModule } from '@angular/router/testing'; import { of } from 'rxjs'; -import { configureTestBed, expectItemTasks } from '../../../testing/unit-test-helper'; +import { configureTestBed, expectItemTasks } from '~/testing/unit-test-helper'; import { RbdService } from '../api/rbd.service'; import { ExecutingTask } from '../models/executing-task'; import { SummaryService } from './summary.service'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/services/task-manager.service.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/services/task-manager.service.spec.ts index 675b037b1cf..117b60c7edc 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/services/task-manager.service.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/services/task-manager.service.spec.ts @@ -3,7 +3,7 @@ import { fakeAsync, TestBed, tick } from '@angular/core/testing'; import _ from 'lodash'; import { BehaviorSubject } from 'rxjs'; -import { configureTestBed } from '../../../testing/unit-test-helper'; +import { configureTestBed } from '~/testing/unit-test-helper'; import { SummaryService } from './summary.service'; import { TaskManagerService } from './task-manager.service'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/services/task-message.service.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/services/task-message.service.spec.ts index 282ef649a77..a529656a0a0 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/services/task-message.service.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/services/task-message.service.spec.ts @@ -3,7 +3,7 @@ import { TestBed } from '@angular/core/testing'; import _ from 'lodash'; -import { configureTestBed } from '../../../testing/unit-test-helper'; +import { configureTestBed } from '~/testing/unit-test-helper'; import { RbdService } from '../api/rbd.service'; import { FinishedTask } from '../models/finished-task'; import { TaskException } from '../models/task-exception'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/services/task-wrapper.service.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/services/task-wrapper.service.spec.ts index 2d64dd191da..e819622118e 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/services/task-wrapper.service.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/services/task-wrapper.service.spec.ts @@ -5,7 +5,7 @@ import { RouterTestingModule } from '@angular/router/testing'; import { ToastrModule } from 'ngx-toastr'; import { Observable } from 'rxjs'; -import { configureTestBed } from '../../../testing/unit-test-helper'; +import { configureTestBed } from '~/testing/unit-test-helper'; import { FinishedTask } from '../models/finished-task'; import { SharedModule } from '../shared.module'; import { NotificationService } from './notification.service'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/services/telemetry-notification.service.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/services/telemetry-notification.service.spec.ts index 41d8060ea15..ea1f910e1a6 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/services/telemetry-notification.service.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/services/telemetry-notification.service.spec.ts @@ -1,6 +1,6 @@ import { TestBed } from '@angular/core/testing'; -import { configureTestBed } from '../../../testing/unit-test-helper'; +import { configureTestBed } from '~/testing/unit-test-helper'; import { TelemetryNotificationService } from './telemetry-notification.service'; describe('TelemetryNotificationService', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/services/text-to-download.service.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/services/text-to-download.service.spec.ts index e974f2d5525..f9ff4d29de2 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/services/text-to-download.service.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/services/text-to-download.service.spec.ts @@ -1,6 +1,6 @@ import { TestBed } from '@angular/core/testing'; -import { configureTestBed } from '../../../testing/unit-test-helper'; +import { configureTestBed } from '~/testing/unit-test-helper'; import { TextToDownloadService } from './text-to-download.service'; describe('TextToDownloadService', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/services/time-diff.service.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/services/time-diff.service.spec.ts index aa31d14ff0c..52be82b09b1 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/services/time-diff.service.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/services/time-diff.service.spec.ts @@ -1,6 +1,6 @@ import { TestBed } from '@angular/core/testing'; -import { configureTestBed } from '../../../testing/unit-test-helper'; +import { configureTestBed } from '~/testing/unit-test-helper'; import { TimeDiffService } from './time-diff.service'; describe('TimeDiffService', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/services/timer.service.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/services/timer.service.spec.ts index 496f4ac9bd9..10b528e3ad0 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/services/timer.service.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/services/timer.service.spec.ts @@ -2,7 +2,7 @@ import { fakeAsync, TestBed, tick } from '@angular/core/testing'; import { of, Subscription } from 'rxjs'; -import { configureTestBed } from '../../../testing/unit-test-helper'; +import { configureTestBed } from '~/testing/unit-test-helper'; import { TimerService } from './timer.service'; describe('TimerService', () => {