From 50f6377ee56b99c45b1e83accef065d91a0ba384 Mon Sep 17 00:00:00 2001 From: Igor Kulikov Date: Tue, 11 Feb 2020 12:06:51 +0200 Subject: [PATCH] Optimize imports --- .../attribute/add-widget-to-dashboard-dialog.component.ts | 2 +- .../dashboard}/select-target-layout-dialog.component.html | 0 .../dashboard}/select-target-layout-dialog.component.ts | 0 .../app/modules/home/components/home-components.module.ts | 5 ++++- .../modules/home/pages/dashboard/dashboard-page.component.ts | 2 +- .../src/app/modules/home/pages/dashboard/dashboard.module.ts | 2 -- 6 files changed, 6 insertions(+), 5 deletions(-) rename ui-ngx/src/app/modules/home/{pages/dashboard/layout => components/dashboard}/select-target-layout-dialog.component.html (100%) rename ui-ngx/src/app/modules/home/{pages/dashboard/layout => components/dashboard}/select-target-layout-dialog.component.ts (100%) diff --git a/ui-ngx/src/app/modules/home/components/attribute/add-widget-to-dashboard-dialog.component.ts b/ui-ngx/src/app/modules/home/components/attribute/add-widget-to-dashboard-dialog.component.ts index bf96840d5c..237482dda5 100644 --- a/ui-ngx/src/app/modules/home/components/attribute/add-widget-to-dashboard-dialog.component.ts +++ b/ui-ngx/src/app/modules/home/components/attribute/add-widget-to-dashboard-dialog.component.ts @@ -37,7 +37,7 @@ import { EntityId } from '@app/shared/models/id/entity-id'; import { Widget } from '@app/shared/models/widget.models'; import { DashboardService } from '@core/http/dashboard.service'; import { forkJoin, Observable, of } from 'rxjs'; -import { SelectTargetLayoutDialogComponent } from '@home/pages/dashboard/layout/select-target-layout-dialog.component'; +import { SelectTargetLayoutDialogComponent } from '@home/components/dashboard/select-target-layout-dialog.component'; import { MatDialog } from '@angular/material/dialog'; import { SelectTargetStateDialogComponent, diff --git a/ui-ngx/src/app/modules/home/pages/dashboard/layout/select-target-layout-dialog.component.html b/ui-ngx/src/app/modules/home/components/dashboard/select-target-layout-dialog.component.html similarity index 100% rename from ui-ngx/src/app/modules/home/pages/dashboard/layout/select-target-layout-dialog.component.html rename to ui-ngx/src/app/modules/home/components/dashboard/select-target-layout-dialog.component.html diff --git a/ui-ngx/src/app/modules/home/pages/dashboard/layout/select-target-layout-dialog.component.ts b/ui-ngx/src/app/modules/home/components/dashboard/select-target-layout-dialog.component.ts similarity index 100% rename from ui-ngx/src/app/modules/home/pages/dashboard/layout/select-target-layout-dialog.component.ts rename to ui-ngx/src/app/modules/home/components/dashboard/select-target-layout-dialog.component.ts diff --git a/ui-ngx/src/app/modules/home/components/home-components.module.ts b/ui-ngx/src/app/modules/home/components/home-components.module.ts index 68cfa079ef..6403c3b12b 100644 --- a/ui-ngx/src/app/modules/home/components/home-components.module.ts +++ b/ui-ngx/src/app/modules/home/components/home-components.module.ts @@ -64,6 +64,7 @@ import { ImportDialogCsvComponent } from '@home/components/import-export/import- import { TableColumnsAssignmentComponent } from '@home/components/import-export/table-columns-assignment.component'; import { EventContentDialogComponent } from '@home/components/event/event-content-dialog.component'; import { SharedHomeComponentsModule } from '@home/components/shared-home-components.module'; +import { SelectTargetLayoutDialogComponent } from '@home/components/dashboard/select-target-layout-dialog.component'; @NgModule({ declarations: @@ -109,6 +110,7 @@ import { SharedHomeComponentsModule } from '@home/components/shared-home-compone CustomDialogContainerComponent, ImportDialogComponent, ImportDialogCsvComponent, + SelectTargetLayoutDialogComponent, AddWidgetToDashboardDialogComponent, TableColumnsAssignmentComponent ], @@ -150,7 +152,8 @@ import { SharedHomeComponentsModule } from '@home/components/shared-home-compone CustomDialogContainerComponent, ImportDialogComponent, ImportDialogCsvComponent, - TableColumnsAssignmentComponent + TableColumnsAssignmentComponent, + SelectTargetLayoutDialogComponent ], providers: [ WidgetComponentService, diff --git a/ui-ngx/src/app/modules/home/pages/dashboard/dashboard-page.component.ts b/ui-ngx/src/app/modules/home/pages/dashboard/dashboard-page.component.ts index 54ce1417c5..258c7b767f 100644 --- a/ui-ngx/src/app/modules/home/pages/dashboard/dashboard-page.component.ts +++ b/ui-ngx/src/app/modules/home/pages/dashboard/dashboard-page.component.ts @@ -74,7 +74,7 @@ import { ManageDashboardLayoutsDialogComponent, ManageDashboardLayoutsDialogData } from '@home/pages/dashboard/layout/manage-dashboard-layouts-dialog.component'; -import { SelectTargetLayoutDialogComponent } from '@home/pages/dashboard/layout/select-target-layout-dialog.component'; +import { SelectTargetLayoutDialogComponent } from '@home/components/dashboard/select-target-layout-dialog.component'; import { DashboardSettingsDialogComponent, DashboardSettingsDialogData diff --git a/ui-ngx/src/app/modules/home/pages/dashboard/dashboard.module.ts b/ui-ngx/src/app/modules/home/pages/dashboard/dashboard.module.ts index e5f1388c6a..37797282a6 100644 --- a/ui-ngx/src/app/modules/home/pages/dashboard/dashboard.module.ts +++ b/ui-ngx/src/app/modules/home/pages/dashboard/dashboard.module.ts @@ -32,7 +32,6 @@ import { EditWidgetComponent } from './edit-widget.component'; import { DashboardWidgetSelectComponent } from './dashboard-widget-select.component'; import { AddWidgetDialogComponent } from './add-widget-dialog.component'; import { ManageDashboardLayoutsDialogComponent } from './layout/manage-dashboard-layouts-dialog.component'; -import { SelectTargetLayoutDialogComponent } from './layout/select-target-layout-dialog.component'; import { DashboardSettingsDialogComponent } from './dashboard-settings-dialog.component'; import { ManageDashboardStatesDialogComponent } from './states/manage-dashboard-states-dialog.component'; import { DashboardStateDialogComponent } from './states/dashboard-state-dialog.component'; @@ -51,7 +50,6 @@ import { SelectTargetStateDialogComponent } from './states/select-target-state-d DashboardWidgetSelectComponent, AddWidgetDialogComponent, ManageDashboardLayoutsDialogComponent, - SelectTargetLayoutDialogComponent, DashboardSettingsDialogComponent, ManageDashboardStatesDialogComponent, DashboardStateDialogComponent,