Showing
5 changed files
with
6 additions
and
5 deletions
| @@ -42,7 +42,7 @@ import { MatDialog } from '@angular/material/dialog'; | @@ -42,7 +42,7 @@ import { MatDialog } from '@angular/material/dialog'; | ||
| 42 | import { | 42 | import { |
| 43 | SelectTargetStateDialogComponent, | 43 | SelectTargetStateDialogComponent, |
| 44 | SelectTargetStateDialogData | 44 | SelectTargetStateDialogData |
| 45 | -} from '@home/pages/dashboard/states/select-target-state-dialog.component'; | 45 | +} from '@home/components/dashboard/select-target-state-dialog.component'; |
| 46 | import { mergeMap, map } from 'rxjs/operators'; | 46 | import { mergeMap, map } from 'rxjs/operators'; |
| 47 | import { AliasesInfo } from '@shared/models/alias.models'; | 47 | import { AliasesInfo } from '@shared/models/alias.models'; |
| 48 | import { ItemBufferService } from '@core/services/item-buffer.service'; | 48 | import { ItemBufferService } from '@core/services/item-buffer.service'; |
ui-ngx/src/app/modules/home/components/dashboard/select-target-state-dialog.component.html
renamed from
ui-ngx/src/app/modules/home/pages/dashboard/states/select-target-state-dialog.component.html
ui-ngx/src/app/modules/home/components/dashboard/select-target-state-dialog.component.ts
renamed from
ui-ngx/src/app/modules/home/pages/dashboard/states/select-target-state-dialog.component.ts
| @@ -65,6 +65,7 @@ import { TableColumnsAssignmentComponent } from '@home/components/import-export/ | @@ -65,6 +65,7 @@ import { TableColumnsAssignmentComponent } from '@home/components/import-export/ | ||
| 65 | import { EventContentDialogComponent } from '@home/components/event/event-content-dialog.component'; | 65 | import { EventContentDialogComponent } from '@home/components/event/event-content-dialog.component'; |
| 66 | import { SharedHomeComponentsModule } from '@home/components/shared-home-components.module'; | 66 | import { SharedHomeComponentsModule } from '@home/components/shared-home-components.module'; |
| 67 | import { SelectTargetLayoutDialogComponent } from '@home/components/dashboard/select-target-layout-dialog.component'; | 67 | import { SelectTargetLayoutDialogComponent } from '@home/components/dashboard/select-target-layout-dialog.component'; |
| 68 | +import { SelectTargetStateDialogComponent } from '@home/components/dashboard/select-target-state-dialog.component'; | ||
| 68 | 69 | ||
| 69 | @NgModule({ | 70 | @NgModule({ |
| 70 | declarations: | 71 | declarations: |
| @@ -111,6 +112,7 @@ import { SelectTargetLayoutDialogComponent } from '@home/components/dashboard/se | @@ -111,6 +112,7 @@ import { SelectTargetLayoutDialogComponent } from '@home/components/dashboard/se | ||
| 111 | ImportDialogComponent, | 112 | ImportDialogComponent, |
| 112 | ImportDialogCsvComponent, | 113 | ImportDialogCsvComponent, |
| 113 | SelectTargetLayoutDialogComponent, | 114 | SelectTargetLayoutDialogComponent, |
| 115 | + SelectTargetStateDialogComponent, | ||
| 114 | AddWidgetToDashboardDialogComponent, | 116 | AddWidgetToDashboardDialogComponent, |
| 115 | TableColumnsAssignmentComponent | 117 | TableColumnsAssignmentComponent |
| 116 | ], | 118 | ], |
| @@ -153,7 +155,8 @@ import { SelectTargetLayoutDialogComponent } from '@home/components/dashboard/se | @@ -153,7 +155,8 @@ import { SelectTargetLayoutDialogComponent } from '@home/components/dashboard/se | ||
| 153 | ImportDialogComponent, | 155 | ImportDialogComponent, |
| 154 | ImportDialogCsvComponent, | 156 | ImportDialogCsvComponent, |
| 155 | TableColumnsAssignmentComponent, | 157 | TableColumnsAssignmentComponent, |
| 156 | - SelectTargetLayoutDialogComponent | 158 | + SelectTargetLayoutDialogComponent, |
| 159 | + SelectTargetStateDialogComponent | ||
| 157 | ], | 160 | ], |
| 158 | providers: [ | 161 | providers: [ |
| 159 | WidgetComponentService, | 162 | WidgetComponentService, |
| @@ -35,7 +35,6 @@ import { ManageDashboardLayoutsDialogComponent } from './layout/manage-dashboard | @@ -35,7 +35,6 @@ import { ManageDashboardLayoutsDialogComponent } from './layout/manage-dashboard | ||
| 35 | import { DashboardSettingsDialogComponent } from './dashboard-settings-dialog.component'; | 35 | import { DashboardSettingsDialogComponent } from './dashboard-settings-dialog.component'; |
| 36 | import { ManageDashboardStatesDialogComponent } from './states/manage-dashboard-states-dialog.component'; | 36 | import { ManageDashboardStatesDialogComponent } from './states/manage-dashboard-states-dialog.component'; |
| 37 | import { DashboardStateDialogComponent } from './states/dashboard-state-dialog.component'; | 37 | import { DashboardStateDialogComponent } from './states/dashboard-state-dialog.component'; |
| 38 | -import { SelectTargetStateDialogComponent } from './states/select-target-state-dialog.component'; | ||
| 39 | 38 | ||
| 40 | @NgModule({ | 39 | @NgModule({ |
| 41 | declarations: [ | 40 | declarations: [ |
| @@ -52,8 +51,7 @@ import { SelectTargetStateDialogComponent } from './states/select-target-state-d | @@ -52,8 +51,7 @@ import { SelectTargetStateDialogComponent } from './states/select-target-state-d | ||
| 52 | ManageDashboardLayoutsDialogComponent, | 51 | ManageDashboardLayoutsDialogComponent, |
| 53 | DashboardSettingsDialogComponent, | 52 | DashboardSettingsDialogComponent, |
| 54 | ManageDashboardStatesDialogComponent, | 53 | ManageDashboardStatesDialogComponent, |
| 55 | - DashboardStateDialogComponent, | ||
| 56 | - SelectTargetStateDialogComponent | 54 | + DashboardStateDialogComponent |
| 57 | ], | 55 | ], |
| 58 | imports: [ | 56 | imports: [ |
| 59 | CommonModule, | 57 | CommonModule, |