import { ApiModule } from '../../../shared/api/api.module';
import { ComponentsModule } from '../../../shared/components/components.module';
import { AuthStorageService } from '../../../shared/services/auth-storage.service';
-import { ServicesModule } from '../../../shared/services/services.module';
import { RbdSnapshotFormComponent } from './rbd-snapshot-form.component';
describe('RbdSnapshotFormComponent', () => {
ReactiveFormsModule,
ComponentsModule,
HttpClientTestingModule,
- ServicesModule,
ApiModule,
ToastModule.forRoot(),
RouterTestingModule
import { PipesModule } from '../../../shared/pipes/pipes.module';
import { AuthStorageService } from '../../../shared/services/auth-storage.service';
import { NotificationService } from '../../../shared/services/notification.service';
-import { ServicesModule } from '../../../shared/services/services.module';
import { SummaryService } from '../../../shared/services/summary.service';
import { TaskListService } from '../../../shared/services/task-list.service';
import { RbdSnapshotListComponent } from './rbd-snapshot-list.component';
DataTableModule,
ComponentsModule,
ToastModule.forRoot(),
- ServicesModule,
ApiModule,
HttpClientTestingModule,
RouterTestingModule,
import { TooltipModule } from 'ngx-bootstrap/tooltip';
import { ActionLabels, URLVerbs } from '../../shared/constants/app.constants';
-import { ServicesModule } from '../../shared/services/services.module';
import { SharedModule } from '../../shared/shared.module';
import { BlockModule } from '../block/block.module';
import { CephSharedModule } from '../shared/ceph-shared.module';
RouterModule,
ReactiveFormsModule,
BsDropdownModule,
- ServicesModule,
TooltipModule.forRoot(),
BlockModule
],
import { configureTestBed } from '../../../../testing/unit-test-helper';
import { PipesModule } from '../../pipes/pipes.module';
-import { ServicesModule } from '../../services/services.module';
import { UsageBarComponent } from './usage-bar.component';
describe('UsageBarComponent', () => {
let fixture: ComponentFixture<UsageBarComponent>;
configureTestBed({
- imports: [PipesModule, ServicesModule, TooltipModule.forRoot()],
+ imports: [PipesModule, TooltipModule.forRoot()],
declarations: [UsageBarComponent]
});
import { Injectable } from '@angular/core';
import { FormBuilder } from '@angular/forms';
-import { ServicesModule } from '../services/services.module';
import { CdFormGroup } from './cd-form-group';
/**
* CdFormBuilder extends FormBuilder to create an CdFormGroup based form.
*/
@Injectable({
- providedIn: ServicesModule
+ providedIn: 'root'
})
export class CdFormBuilder extends FormBuilder {
group(
import { FinishedTask } from '../models/finished-task';
import { AuthStorageService } from './auth-storage.service';
import { NotificationService } from './notification.service';
-import { ServicesModule } from './services.module';
@Injectable({
- providedIn: ServicesModule
+ providedIn: 'root'
})
export class ApiInterceptorService implements HttpInterceptor {
constructor(
import { CanActivate, CanActivateChild, Router } from '@angular/router';
import { AuthStorageService } from './auth-storage.service';
-import { ServicesModule } from './services.module';
@Injectable({
- providedIn: ServicesModule
+ providedIn: 'root'
})
export class AuthGuardService implements CanActivate, CanActivateChild {
constructor(private router: Router, private authStorageService: AuthStorageService) {}
import { Injectable } from '@angular/core';
import { Permissions } from '../models/permissions';
-import { ServicesModule } from './services.module';
@Injectable({
- providedIn: ServicesModule
+ providedIn: 'root'
})
export class AuthStorageService {
constructor() {}
import { map } from 'rxjs/operators';
import { FeatureTogglesMap, FeatureTogglesService } from './feature-toggles.service';
-import { ServicesModule } from './services.module';
@Injectable({
- providedIn: ServicesModule
+ providedIn: 'root'
})
export class FeatureTogglesGuardService implements CanActivate, CanActivateChild {
constructor(private router: Router, private featureToggles: FeatureTogglesService) {}
import { Observable, timer } from 'rxjs';
import { flatMap, shareReplay } from 'rxjs/operators';
-import { ServicesModule } from './services.module';
-
export type FeatureTogglesMap = Map<string, boolean>;
export type FeatureTogglesMap$ = Observable<FeatureTogglesMap>;
@Injectable({
- providedIn: ServicesModule
+ providedIn: 'root'
})
export class FeatureTogglesService {
readonly API_URL: string = 'api/feature_toggles';
import * as _ from 'lodash';
-import { ServicesModule } from './services.module';
-
@Injectable({
- providedIn: ServicesModule
+ providedIn: 'root'
})
export class FormatterService {
constructor() {}
import { of as observableOf } from 'rxjs';
import { catchError, map } from 'rxjs/operators';
-import { ServicesModule } from './services.module';
-
/**
* This service checks if a route can be activated by executing a
* REST API call to '/api/<apiPath>/status'. If the returned response
* ...
*/
@Injectable({
- providedIn: ServicesModule
+ providedIn: 'root'
})
export class ModuleStatusGuardService implements CanActivate, CanActivateChild {
// TODO: Hotfix - remove WHITELIST'ing when a generic ErrorComponent is implemented
import { CdNotification, CdNotificationConfig } from '../models/cd-notification';
import { FinishedTask } from '../models/finished-task';
import { CdDatePipe } from '../pipes/cd-date.pipe';
-import { ServicesModule } from './services.module';
import { TaskMessageService } from './task-message.service';
@Injectable({
- providedIn: ServicesModule
+ providedIn: 'root'
})
export class NotificationService {
private hideToasties = false;
PrometheusNotificationAlert
} from '../models/prometheus-alerts';
import { NotificationService } from './notification.service';
-import { ServicesModule } from './services.module';
@Injectable({
- providedIn: ServicesModule
+ providedIn: 'root'
})
export class PrometheusAlertFormatter {
constructor(private notificationService: NotificationService) {}
import { PrometheusService } from '../api/prometheus.service';
import { PrometheusAlert, PrometheusCustomAlert } from '../models/prometheus-alerts';
import { PrometheusAlertFormatter } from './prometheus-alert-formatter';
-import { ServicesModule } from './services.module';
@Injectable({
- providedIn: ServicesModule
+ providedIn: 'root'
})
export class PrometheusAlertService {
private canAlertsBeNotified = false;
import { CdNotificationConfig } from '../models/cd-notification';
import { PrometheusNotification } from '../models/prometheus-alerts';
import { PrometheusAlertFormatter } from './prometheus-alert-formatter';
-import { ServicesModule } from './services.module';
@Injectable({
- providedIn: ServicesModule
+ providedIn: 'root'
})
export class PrometheusNotificationService {
private notifications: PrometheusNotification[];
RbdConfigurationSection,
RbdConfigurationType
} from '../models/configuration';
-import { ServicesModule } from './services.module';
/**
* Define here which options should be made available under which section heading.
* this information.
*/
@Injectable({
- providedIn: ServicesModule
+ providedIn: 'root'
})
export class RbdConfigurationService {
readonly sections: RbdConfigurationSection[];
import { BehaviorSubject, interval, Subscription } from 'rxjs';
-import { ServicesModule } from './services.module';
@Injectable({
- providedIn: ServicesModule
+ providedIn: 'root'
})
export class RefreshIntervalService implements OnDestroy {
private intervalTime: number;
+++ /dev/null
-import { CommonModule } from '@angular/common';
-import { NgModule } from '@angular/core';
-
-@NgModule({
- imports: [CommonModule]
-})
-export class ServicesModule {}
import { BehaviorSubject, Subscription } from 'rxjs';
import { ExecutingTask } from '../models/executing-task';
-import { ServicesModule } from './services.module';
@Injectable({
- providedIn: ServicesModule
+ providedIn: 'root'
})
export class SummaryService {
// Observable sources
import { ExecutingTask } from '../models/executing-task';
import { FinishedTask } from '../models/finished-task';
import { Task } from '../models/task';
-import { ServicesModule } from './services.module';
import { SummaryService } from './summary.service';
class TaskSubscription {
}
@Injectable({
- providedIn: ServicesModule
+ providedIn: 'root'
})
export class TaskManagerService {
subscriptions: Array<TaskSubscription> = [];
import { Components } from '../enum/components.enum';
import { FinishedTask } from '../models/finished-task';
import { Task } from '../models/task';
-import { ServicesModule } from './services.module';
export class TaskMessageOperation {
running: string;
}
@Injectable({
- providedIn: ServicesModule
+ providedIn: 'root'
})
export class TaskMessageService {
constructor(private i18n: I18n) {}
import { ExecutingTask } from '../models/executing-task';
import { FinishedTask } from '../models/finished-task';
import { NotificationService } from './notification.service';
-import { ServicesModule } from './services.module';
import { SummaryService } from './summary.service';
import { TaskManagerService } from './task-manager.service';
import { TaskMessageService } from './task-message.service';
@Injectable({
- providedIn: ServicesModule
+ providedIn: 'root'
})
export class TaskWrapperService {
constructor(
import { AuthGuardService } from './services/auth-guard.service';
import { AuthStorageService } from './services/auth-storage.service';
import { FormatterService } from './services/formatter.service';
-import { ServicesModule } from './services/services.module';
@NgModule({
imports: [
CommonModule,
PipesModule,
ComponentsModule,
- ServicesModule,
DataTableModule,
ApiModule,
DirectivesModule
],
declarations: [],
- exports: [
- ComponentsModule,
- PipesModule,
- ServicesModule,
- DataTableModule,
- ApiModule,
- DirectivesModule
- ],
+ exports: [ComponentsModule, PipesModule, DataTableModule, ApiModule, DirectivesModule],
providers: [AuthStorageService, AuthGuardService, FormatterService]
})
export class SharedModule {}
projects / ceph.git / commitdiff