fix(circular-dependencies): fix compilation warnings

src/app/reducers/security-groups/redux/sg.effects.ts

@@ -1,18 +1,24 @@
 import { Injectable } from '@angular/core';
-import { Actions, Effect } from '@ngrx/effects';
+import {
+  Actions,
+  Effect
+} from '@ngrx/effects';
 import { Observable } from 'rxjs/Observable';
 import { Action } from '@ngrx/store';
 import { SecurityGroupService } from '../../../security-group/services/security-group.service';
-import { SecurityGroupViewMode } from '../../../security-group/sg-filter/containers/sg-filter.container';
 import { Rules } from '../../../shared/components/security-group-builder/rules';
-import { SecurityGroup, SecurityGroupType } from '../../../security-group/sg.model';
+import {
+  SecurityGroup,
+  SecurityGroupType
+} from '../../../security-group/sg.model';
 import { DialogService } from '../../../dialog/dialog-service/dialog.service';
 import { NotificationService } from '../../../shared/services/notification.service';
 import { Router } from '@angular/router';
 import { MatDialog } from '@angular/material';
 import { SecurityGroupCreationParams } from '../../../security-group/sg-creation/security-group-creation.component';
 
 import * as securityGroup from './sg.actions';
+import { SecurityGroupViewMode } from '../../../security-group/sg-view-mode';
 
 @Injectable()
 export class SecurityGroupEffects {

src/app/reducers/security-groups/redux/sg.reducers.ts

@@ -1,8 +1,19 @@
-import { createEntityAdapter, EntityAdapter, EntityState } from '@ngrx/entity';
-import { createFeatureSelector, createSelector } from '@ngrx/store';
-import { SecurityGroup, SecurityGroupType } from '../../../security-group/sg.model';
+import {
+  createEntityAdapter,
+  EntityAdapter,
+  EntityState
+} from '@ngrx/entity';
+import {
+  createFeatureSelector,
+  createSelector
+} from '@ngrx/store';
+import {
+  SecurityGroup,
+  SecurityGroupType
+} from '../../../security-group/sg.model';
 import * as securityGroup from './sg.actions';
-import { SecurityGroupViewMode } from '../../../security-group/sg-filter/containers/sg-filter.container';
+import { SecurityGroupViewMode } from '../../../security-group/sg-view-mode';
+
 
 export interface State {
   list: ListState,

src/app/reducers/templates/redux/template.reducers.ts

@@ -14,13 +14,13 @@ import {
 import { BaseTemplateModel } from '../../../template/shared/base-template.model';
 import { TemplateTagKeys } from '../../../shared/services/tags/template-tag-keys';
 import { getUserAccount } from '../../auth/redux/auth.reducers';
-import { DefaultTemplateGroupId } from '../../../template/template-sidebar/template-group/template-group.component';
 
 import * as fromAccounts from '../../accounts/redux/accounts.reducers';
 import * as fromVMs from '../../vm/redux/vm.reducers';
 import * as fromOsTypes from './ostype.reducers';
 import * as fromTemplateGroups from './template-group.reducers';
 import * as template from './template.actions';
+import { DefaultTemplateGroupId } from '../../../shared/models/template-group.model';
 
 
 export interface ListState extends EntityState<BaseTemplateModel> {

src/app/reducers/volumes/redux/volumes.actions.ts

@@ -1,6 +1,8 @@
 import { Action } from '@ngrx/store';
-import { Volume } from '../../../shared/models/volume.model';
-import { VolumeCreationData } from '../../../volume/container/volume-creation.container';
+import {
+  Volume,
+  VolumeCreationData
+} from '../../../shared/models/volume.model';
 import { VolumeResizeData } from '../../../shared/services/volume.service';
 import { Snapshot } from '../../../shared/models/snapshot.model';
 

src/app/security-group/sg-creation/security-group-creation.component.ts

@@ -5,9 +5,8 @@ import {
   Input,
   Output
 } from '@angular/core';
-import { DialogService } from '../../dialog/dialog-service/dialog.service';
 import { Rules } from '../../shared/components/security-group-builder/rules';
-import { SecurityGroupViewMode } from '../sg-filter/containers/sg-filter.container';
+import { SecurityGroupViewMode } from '../sg-view-mode';
 
 export interface SecurityGroupCreationParams {
   mode: SecurityGroupViewMode;

src/app/security-group/sg-filter/containers/sg-filter.container.ts

@@ -1,5 +1,11 @@
-import { Component, OnInit } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
+import {
+  Component,
+  OnInit
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  Router
+} from '@angular/router';
 import { FilterService } from '../../../shared/services/filter.service';
 import { LocalStorageService } from '../../../shared/services/local-storage.service';
 import { WithUnsubscribe } from '../../../utils/mixins/with-unsubscribe';
@@ -8,11 +14,8 @@ import { State } from '../../../reducers/index';
 
 import * as  securityGroupActions from '../../../reducers/security-groups/redux/sg.actions';
 import * as  fromSecurityGroups from '../../../reducers/security-groups/redux/sg.reducers';
+import { SecurityGroupViewMode } from '../../sg-view-mode';
 
-export enum SecurityGroupViewMode {
-  Templates = 'templates',
-  Shared = 'shared'
-}
 
 @Component({
   selector: 'cs-sg-filter-container',

src/app/security-group/sg-filter/sg-filter.component.ts

@@ -1,5 +1,10 @@
-import { Component, EventEmitter, Input, Output } from '@angular/core';
-import { SecurityGroupViewMode } from './containers/sg-filter.container';
+import {
+  Component,
+  EventEmitter,
+  Input,
+  Output
+} from '@angular/core';
+import { SecurityGroupViewMode } from '../sg-view-mode';
 
 
 export interface SecurityGroupFilter {

src/app/security-group/sg-list/security-group-list.component.ts

@@ -1,11 +1,18 @@
-import { Component, Input, OnChanges } from '@angular/core';
-import { SecurityGroup, SecurityGroupType } from '../sg.model';
+import {
+  Component,
+  Input,
+  OnChanges
+} from '@angular/core';
+import {
+  SecurityGroup,
+  SecurityGroupType
+} from '../sg.model';
 import { ViewMode } from '../../shared/components/view-mode-switch/view-mode-switch.component';
 import { SecurityGroupCardItemComponent } from '../sg-list-item/card-item/security-group-card-item.component';
 import { SecurityGroupRowItemComponent } from '../sg-list-item/row-item/security-group-row-item.component';
 import { TranslateService } from '@ngx-translate/core';
-import { SecurityGroupViewMode } from '../sg-filter/containers/sg-filter.container';
 import { ListService } from '../../shared/components/list/list.service';
+import { SecurityGroupViewMode } from '../sg-view-mode';
 
 
 @Component({

src/app/security-group/sg-page/security-group-page.component.ts

@@ -1,9 +1,15 @@
-import { Component, Input } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
+import {
+  Component,
+  Input
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  Router
+} from '@angular/router';
 import { SecurityGroup, } from '../sg.model';
 import { ViewMode } from '../../shared/components/view-mode-switch/view-mode-switch.component';
-import { SecurityGroupViewMode } from '../sg-filter/containers/sg-filter.container';
 import { ListService } from '../../shared/components/list/list.service';
+import { SecurityGroupViewMode } from '../sg-view-mode';
 
 @Component({
   selector: 'cs-security-group-page',

src/app/security-group/sg-sidebar/sg-vm-list/security-group-vm-list.component.ts

@@ -3,7 +3,7 @@ import {
   Input
 } from '@angular/core';
 import { VirtualMachine } from '../../../vm/shared/vm.model';
-import { SecurityGroupViewMode } from '../../sg-filter/containers/sg-filter.container';
+import { SecurityGroupViewMode } from '../../sg-view-mode';
 
 
 @Component({

src/app/security-group/sg-view-mode.ts

@@ -0,0 +1,4 @@
+export enum SecurityGroupViewMode {
+  Templates = 'templates',
+  Shared = 'shared'
+}

src/app/shared/models/template-group.model.ts

@@ -5,3 +5,5 @@ export class TemplateGroup {
   constructor(id: string) {
   }
 }
+
+export const DefaultTemplateGroupId = 'general';

src/app/shared/models/volume.model.ts

@@ -11,6 +11,12 @@ import {
 } from './tag.model';
 import { ServiceOffering } from './service-offering.model';
 
+export class VolumeCreationData {
+  public name: string;
+  public zoneId: string;
+  public diskOfferingId: string;
+  public size?: number;
+}
 
 export enum VolumeType {
   ROOT = 'ROOT',

src/app/snapshot/recurring-snapshots/policy-editor/policy-editor.component.ts

@@ -6,8 +6,8 @@ import {
   Output
 } from '@angular/core';
 import { TimeFormat } from '../../../shared/services/language.service';
-import { PolicyType } from '../recurring-snapshots.component';
 import { TimeZone } from '../../../shared/components/time-zone/time-zone.service';
+import { PolicyType } from '../snapshot-policy-type';
 
 
 export type TimePolicy = any;

src/app/snapshot/recurring-snapshots/policy-list/policy-list.component.ts

@@ -9,11 +9,13 @@ import {
 } from '@angular/core';
 import { TranslateService } from '@ngx-translate/core';
 import { TimeFormat } from '../../../shared/services/language.service';
-import { Policy, TimePolicy } from '../policy-editor/policy-editor.component';
-import { PolicyType } from '../recurring-snapshots.component';
+import {
+  Policy,
+  TimePolicy
+} from '../policy-editor/policy-editor.component';
 import { PolicyViewBuilderService } from './policy-view-builder.service';
+import { PolicyType } from '../snapshot-policy-type';
 import DateTimeFormat = Intl.DateTimeFormat;
-import { TableDatabase, TableDataSource } from '../../../shared/components/table/table';
 
 
 interface PolicyView {

src/app/snapshot/recurring-snapshots/policy-list/policy-view-builder.service.ts

@@ -1,7 +1,10 @@
 import { Injectable } from '@angular/core';
-import { PolicyType } from '../recurring-snapshots.component';
-import { Policy, TimePolicy } from '../policy-editor/policy-editor.component';
+import {
+  Policy,
+  TimePolicy
+} from '../policy-editor/policy-editor.component';
 import { DayOfWeek } from '../../../shared/types/day-of-week';
+import { PolicyType } from '../snapshot-policy-type';
 import DateTimeFormat = Intl.DateTimeFormat;
 
 

src/app/snapshot/recurring-snapshots/recurring-snapshots.component.ts

@@ -1,21 +1,26 @@
-import { Component, forwardRef, Inject, OnInit } from '@angular/core';
+import {
+  Component,
+  forwardRef,
+  Inject,
+  OnInit
+} from '@angular/core';
 import { NG_VALUE_ACCESSOR } from '@angular/forms';
 import { MAT_DIALOG_DATA } from '@angular/material';
 import { Observable } from 'rxjs/Observable';
 import { DialogService } from '../../dialog/dialog-service/dialog.service';
 import { Volume } from '../../shared/models';
-import { LanguageService, TimeFormat } from '../../shared/services/language.service';
-import { Policy, TimePolicy } from './policy-editor/policy-editor.component';
+import {
+  LanguageService,
+  TimeFormat
+} from '../../shared/services/language.service';
+import {
+  Policy,
+  TimePolicy
+} from './policy-editor/policy-editor.component';
 import { SnapshotPolicyService } from './snapshot-policy.service';
+import { PolicyType } from './snapshot-policy-type';
 
 
-export enum PolicyType {
-  Hourly,
-  Daily,
-  Weekly,
-  Monthly
-}
-
 @Component({
   selector: 'cs-recurring-snapshots',
   templateUrl: 'recurring-snapshots.component.html',

src/app/snapshot/recurring-snapshots/snapshot-policy-type.ts

@@ -0,0 +1,6 @@
+export enum PolicyType {
+  Hourly,
+  Daily,
+  Weekly,
+  Monthly
+}

src/app/snapshot/recurring-snapshots/snapshot-policy.model.ts

@@ -1,6 +1,6 @@
 import { FieldMapper } from '../../shared/decorators';
 import { BaseModel } from '../../shared/models';
-import { PolicyType } from './recurring-snapshots.component';
+import { PolicyType } from './snapshot-policy-type';
 
 
 @FieldMapper({

src/app/snapshot/recurring-snapshots/snapshot-policy.service.ts

@@ -4,11 +4,14 @@ import { BackendResource } from '../../shared/decorators';
 import { BaseBackendService } from '../../shared/services/base-backend.service';
 import { padStart } from '../../shared/utils/padStart';
 import { DayPeriod } from './day-period/day-period.component';
-import { Policy, TimePolicy } from './policy-editor/policy-editor.component';
-import { PolicyType } from './recurring-snapshots.component';
+import {
+  Policy,
+  TimePolicy
+} from './policy-editor/policy-editor.component';
 import { SnapshotPolicy } from './snapshot-policy.model';
 import { Time } from './time-picker/time-picker.component';
 import { HttpClient } from '@angular/common/http';
+import { PolicyType } from './snapshot-policy-type';
 
 
 export interface SnapshotPolicyCreationParams {

src/app/template/template-sidebar/template-group/template-group.component.ts

@@ -12,7 +12,6 @@ import { TemplateTagKeys } from '../../../shared/services/tags/template-tag-keys
 import { TemplateGroupSelectorContainerComponent } from './containers/template-group-selector.container';
 import { TemplateGroup } from '../../../shared/models/template-group.model';
 
-export const DefaultTemplateGroupId = 'general';
 
 @Component({
   selector: 'cs-template-group',

src/app/vm/vm-creation/postdeployment/postdeployment.component.ts

@@ -5,12 +5,17 @@ import {
 import { MatDialogRef } from '@angular/material';
 import { Store } from '@ngrx/store';
 import { Observable } from 'rxjs/Observable';
-import { getLogin, getPassword, isHttpAuthMode } from '../../';
+import {
+  getLogin,
+  getPassword,
+  isHttpAuthMode,
+  VirtualMachine,
+  VmState
+} from '../../shared/vm.model';
 import { DialogService } from '../../../dialog/dialog-service/dialog.service';
 import { State } from '../../../reducers/vm/redux/vm.reducers';
 import { TagService } from '../../../shared/services/tags/tag.service';
 import { VirtualMachineTagKeys } from '../../../shared/services/tags/vm-tag-keys';
-import { VirtualMachine, VmState } from '../../shared/vm.model';
 import { WebShellService } from '../../web-shell/web-shell.service';
 import { VmCreationComponent } from '../vm-creation.component';
 import { UserTagService } from '../../../shared/services/tags/user-tag.service';

src/app/volume/container/volume-creation.container.ts

@@ -17,14 +17,11 @@ import { AuthService } from '../../shared/services/auth.service';
 import { WithUnsubscribe } from '../../utils/mixins/with-unsubscribe';
 import { VolumeCreationDialogComponent } from '../volume-creation/volume-creation-dialog.component';
 import { Zone } from '../../shared/models/zone.model';
-import { VolumeType } from '../../shared/models/volume.model';
+import {
+  VolumeCreationData,
+  VolumeType
+} from '../../shared/models/volume.model';
 
-export class VolumeCreationData {
-  public name: string;
-  public zoneId: string;
-  public diskOfferingId: string;
-  public size?: number;
-}
 
 @Component({
   selector: 'cs-volume-creation-container',

src/app/volume/volume-creation/volume-creation-dialog.component.ts

@@ -7,7 +7,7 @@ import {
 import { MatDialogRef } from '@angular/material';
 import { DiskOffering } from '../../shared/models/disk-offering.model';
 import { Zone } from '../../shared/models';
-import { VolumeCreationData } from '../container/volume-creation.container';
+import { VolumeCreationData } from '../../shared/models/volume.model';
 
 
 @Component({