Showing
6 changed files
with
6 additions
and
5 deletions
| @@ -37,7 +37,7 @@ import { EntityId } from '@app/shared/models/id/entity-id'; | @@ -37,7 +37,7 @@ import { EntityId } from '@app/shared/models/id/entity-id'; | ||
| 37 | import { Widget } from '@app/shared/models/widget.models'; | 37 | import { Widget } from '@app/shared/models/widget.models'; |
| 38 | import { DashboardService } from '@core/http/dashboard.service'; | 38 | import { DashboardService } from '@core/http/dashboard.service'; |
| 39 | import { forkJoin, Observable, of } from 'rxjs'; | 39 | import { forkJoin, Observable, of } from 'rxjs'; |
| 40 | -import { SelectTargetLayoutDialogComponent } from '@home/pages/dashboard/layout/select-target-layout-dialog.component'; | 40 | +import { SelectTargetLayoutDialogComponent } from '@home/components/dashboard/select-target-layout-dialog.component'; |
| 41 | import { MatDialog } from '@angular/material/dialog'; | 41 | import { MatDialog } from '@angular/material/dialog'; |
| 42 | import { | 42 | import { |
| 43 | SelectTargetStateDialogComponent, | 43 | SelectTargetStateDialogComponent, |
ui-ngx/src/app/modules/home/components/dashboard/select-target-layout-dialog.component.html
renamed from
ui-ngx/src/app/modules/home/pages/dashboard/layout/select-target-layout-dialog.component.html
ui-ngx/src/app/modules/home/components/dashboard/select-target-layout-dialog.component.ts
renamed from
ui-ngx/src/app/modules/home/pages/dashboard/layout/select-target-layout-dialog.component.ts
| @@ -64,6 +64,7 @@ import { ImportDialogCsvComponent } from '@home/components/import-export/import- | @@ -64,6 +64,7 @@ import { ImportDialogCsvComponent } from '@home/components/import-export/import- | ||
| 64 | import { TableColumnsAssignmentComponent } from '@home/components/import-export/table-columns-assignment.component'; | 64 | import { TableColumnsAssignmentComponent } from '@home/components/import-export/table-columns-assignment.component'; |
| 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 | 68 | ||
| 68 | @NgModule({ | 69 | @NgModule({ |
| 69 | declarations: | 70 | declarations: |
| @@ -109,6 +110,7 @@ import { SharedHomeComponentsModule } from '@home/components/shared-home-compone | @@ -109,6 +110,7 @@ import { SharedHomeComponentsModule } from '@home/components/shared-home-compone | ||
| 109 | CustomDialogContainerComponent, | 110 | CustomDialogContainerComponent, |
| 110 | ImportDialogComponent, | 111 | ImportDialogComponent, |
| 111 | ImportDialogCsvComponent, | 112 | ImportDialogCsvComponent, |
| 113 | + SelectTargetLayoutDialogComponent, | ||
| 112 | AddWidgetToDashboardDialogComponent, | 114 | AddWidgetToDashboardDialogComponent, |
| 113 | TableColumnsAssignmentComponent | 115 | TableColumnsAssignmentComponent |
| 114 | ], | 116 | ], |
| @@ -150,7 +152,8 @@ import { SharedHomeComponentsModule } from '@home/components/shared-home-compone | @@ -150,7 +152,8 @@ import { SharedHomeComponentsModule } from '@home/components/shared-home-compone | ||
| 150 | CustomDialogContainerComponent, | 152 | CustomDialogContainerComponent, |
| 151 | ImportDialogComponent, | 153 | ImportDialogComponent, |
| 152 | ImportDialogCsvComponent, | 154 | ImportDialogCsvComponent, |
| 153 | - TableColumnsAssignmentComponent | 155 | + TableColumnsAssignmentComponent, |
| 156 | + SelectTargetLayoutDialogComponent | ||
| 154 | ], | 157 | ], |
| 155 | providers: [ | 158 | providers: [ |
| 156 | WidgetComponentService, | 159 | WidgetComponentService, |
| @@ -74,7 +74,7 @@ import { | @@ -74,7 +74,7 @@ import { | ||
| 74 | ManageDashboardLayoutsDialogComponent, | 74 | ManageDashboardLayoutsDialogComponent, |
| 75 | ManageDashboardLayoutsDialogData | 75 | ManageDashboardLayoutsDialogData |
| 76 | } from '@home/pages/dashboard/layout/manage-dashboard-layouts-dialog.component'; | 76 | } from '@home/pages/dashboard/layout/manage-dashboard-layouts-dialog.component'; |
| 77 | -import { SelectTargetLayoutDialogComponent } from '@home/pages/dashboard/layout/select-target-layout-dialog.component'; | 77 | +import { SelectTargetLayoutDialogComponent } from '@home/components/dashboard/select-target-layout-dialog.component'; |
| 78 | import { | 78 | import { |
| 79 | DashboardSettingsDialogComponent, | 79 | DashboardSettingsDialogComponent, |
| 80 | DashboardSettingsDialogData | 80 | DashboardSettingsDialogData |
| @@ -32,7 +32,6 @@ import { EditWidgetComponent } from './edit-widget.component'; | @@ -32,7 +32,6 @@ import { EditWidgetComponent } from './edit-widget.component'; | ||
| 32 | import { DashboardWidgetSelectComponent } from './dashboard-widget-select.component'; | 32 | import { DashboardWidgetSelectComponent } from './dashboard-widget-select.component'; |
| 33 | import { AddWidgetDialogComponent } from './add-widget-dialog.component'; | 33 | import { AddWidgetDialogComponent } from './add-widget-dialog.component'; |
| 34 | import { ManageDashboardLayoutsDialogComponent } from './layout/manage-dashboard-layouts-dialog.component'; | 34 | import { ManageDashboardLayoutsDialogComponent } from './layout/manage-dashboard-layouts-dialog.component'; |
| 35 | -import { SelectTargetLayoutDialogComponent } from './layout/select-target-layout-dialog.component'; | ||
| 36 | import { DashboardSettingsDialogComponent } from './dashboard-settings-dialog.component'; | 35 | import { DashboardSettingsDialogComponent } from './dashboard-settings-dialog.component'; |
| 37 | import { ManageDashboardStatesDialogComponent } from './states/manage-dashboard-states-dialog.component'; | 36 | import { ManageDashboardStatesDialogComponent } from './states/manage-dashboard-states-dialog.component'; |
| 38 | import { DashboardStateDialogComponent } from './states/dashboard-state-dialog.component'; | 37 | import { DashboardStateDialogComponent } from './states/dashboard-state-dialog.component'; |
| @@ -51,7 +50,6 @@ import { SelectTargetStateDialogComponent } from './states/select-target-state-d | @@ -51,7 +50,6 @@ import { SelectTargetStateDialogComponent } from './states/select-target-state-d | ||
| 51 | DashboardWidgetSelectComponent, | 50 | DashboardWidgetSelectComponent, |
| 52 | AddWidgetDialogComponent, | 51 | AddWidgetDialogComponent, |
| 53 | ManageDashboardLayoutsDialogComponent, | 52 | ManageDashboardLayoutsDialogComponent, |
| 54 | - SelectTargetLayoutDialogComponent, | ||
| 55 | DashboardSettingsDialogComponent, | 53 | DashboardSettingsDialogComponent, |
| 56 | ManageDashboardStatesDialogComponent, | 54 | ManageDashboardStatesDialogComponent, |
| 57 | DashboardStateDialogComponent, | 55 | DashboardStateDialogComponent, |