From 625712ad0eaa7605d61a56eaf37d558307a099e1 Mon Sep 17 00:00:00 2001 From: Maksym Dudnik Date: Mon, 3 Jul 2023 11:56:58 +0300 Subject: [PATCH] folder rearranging --- ui-ngx/src/app/modules/common/modules-map.ts | 2 -- .../device-gateway-command.component.html | 0 .../device-gateway-command.component.ts | 0 .../gateway-configuration.component.html | 0 .../gateway-configuration.component.scss | 0 .../gateway-configuration.component.ts | 2 +- .../gateway-connectors.component.html | 0 .../gateway-connectors.component.scss | 0 .../gateway-connectors.component.ts | 2 +- .../gateway-logs.component.html | 0 .../gateway-logs.component.scss | 0 .../gateway-logs.component.ts | 2 +- .../gateway-remote-configuration-dialog.html | 0 .../gateway-remote-configuration-dialog.ts | 0 .../gateway-service-rpc.component.html | 0 .../gateway-service-rpc.component.scss | 0 .../gateway-service-rpc.component.ts | 0 .../gateway-statistics.component.html | 0 .../gateway-statistics.component.scss | 0 .../gateway-statistics.component.ts | 0 .../widget/widget-components.module.ts | 21 ++++++++++++------- ui-ngx/src/app/shared/shared.module.ts | 3 --- 22 files changed, 16 insertions(+), 16 deletions(-) rename ui-ngx/src/app/modules/home/components/widget/lib/{device => gateway}/device-gateway-command.component.html (100%) rename ui-ngx/src/app/modules/home/components/widget/lib/{device => gateway}/device-gateway-command.component.ts (100%) rename ui-ngx/src/app/modules/home/components/widget/lib/{device => gateway}/gateway-configuration.component.html (100%) rename ui-ngx/src/app/modules/home/components/widget/lib/{device => gateway}/gateway-configuration.component.scss (100%) rename ui-ngx/src/app/modules/home/components/widget/lib/{device => gateway}/gateway-configuration.component.ts (99%) rename ui-ngx/src/app/modules/home/components/widget/lib/{device => gateway}/gateway-connectors.component.html (100%) rename ui-ngx/src/app/modules/home/components/widget/lib/{device => gateway}/gateway-connectors.component.scss (100%) rename ui-ngx/src/app/modules/home/components/widget/lib/{device => gateway}/gateway-connectors.component.ts (99%) rename ui-ngx/src/app/modules/home/components/widget/lib/{device => gateway}/gateway-logs.component.html (100%) rename ui-ngx/src/app/modules/home/components/widget/lib/{device => gateway}/gateway-logs.component.scss (100%) rename ui-ngx/src/app/modules/home/components/widget/lib/{device => gateway}/gateway-logs.component.ts (98%) rename ui-ngx/src/app/{shared/components/dialog => modules/home/components/widget/lib/gateway}/gateway-remote-configuration-dialog.html (100%) rename ui-ngx/src/app/{shared/components/dialog => modules/home/components/widget/lib/gateway}/gateway-remote-configuration-dialog.ts (100%) rename ui-ngx/src/app/modules/home/components/widget/lib/{device => gateway}/gateway-service-rpc.component.html (100%) rename ui-ngx/src/app/modules/home/components/widget/lib/{device => gateway}/gateway-service-rpc.component.scss (100%) rename ui-ngx/src/app/modules/home/components/widget/lib/{device => gateway}/gateway-service-rpc.component.ts (100%) rename ui-ngx/src/app/modules/home/components/widget/lib/{device => gateway}/gateway-statistics.component.html (100%) rename ui-ngx/src/app/modules/home/components/widget/lib/{device => gateway}/gateway-statistics.component.scss (100%) rename ui-ngx/src/app/modules/home/components/widget/lib/{device => gateway}/gateway-statistics.component.ts (100%) diff --git a/ui-ngx/src/app/modules/common/modules-map.ts b/ui-ngx/src/app/modules/common/modules-map.ts index e51ecc0e31..5cc9a49d42 100644 --- a/ui-ngx/src/app/modules/common/modules-map.ts +++ b/ui-ngx/src/app/modules/common/modules-map.ts @@ -300,7 +300,6 @@ import * as QueueFormComponent from '@home/components/queue/queue-form.component import * as AssetProfileComponent from '@home/components/profile/asset-profile.component'; import * as AssetProfileDialogComponent from '@home/components/profile/asset-profile-dialog.component'; import * as AssetProfileAutocompleteComponent from '@home/components/profile/asset-profile-autocomplete.component'; -import * as GatewayRemoteConfigurationDialogComponent from '@shared/components/dialog/gateway-remote-configuration-dialog'; import * as RuleChainSelectComponent from '@shared/components/rule-chain/rule-chain-select.component'; import { IModulesMap } from '@modules/common/modules-map.models'; @@ -408,7 +407,6 @@ class ModulesMap implements IModulesMap { '@shared/components/help.component': HelpComponent, '@shared/components/help-markdown.component': HelpMarkdownComponent, '@shared/components/help-popup.component': HelpPopupComponent, - '@shared/components/device/gateway-remote-configuration-dialog': GatewayRemoteConfigurationDialogComponent, '@shared/components/tb-checkbox.component': TbCheckboxComponent, '@shared/components/toast.directive': TbToast, '@shared/components/tb-error.component': TbErrorComponent, diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/device/device-gateway-command.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/device-gateway-command.component.html similarity index 100% rename from ui-ngx/src/app/modules/home/components/widget/lib/device/device-gateway-command.component.html rename to ui-ngx/src/app/modules/home/components/widget/lib/gateway/device-gateway-command.component.html diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/device/device-gateway-command.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/device-gateway-command.component.ts similarity index 100% rename from ui-ngx/src/app/modules/home/components/widget/lib/device/device-gateway-command.component.ts rename to ui-ngx/src/app/modules/home/components/widget/lib/gateway/device-gateway-command.component.ts diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/device/gateway-configuration.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-configuration.component.html similarity index 100% rename from ui-ngx/src/app/modules/home/components/widget/lib/device/gateway-configuration.component.html rename to ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-configuration.component.html diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/device/gateway-configuration.component.scss b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-configuration.component.scss similarity index 100% rename from ui-ngx/src/app/modules/home/components/widget/lib/device/gateway-configuration.component.scss rename to ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-configuration.component.scss diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/device/gateway-configuration.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-configuration.component.ts similarity index 99% rename from ui-ngx/src/app/modules/home/components/widget/lib/device/gateway-configuration.component.ts rename to ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-configuration.component.ts index 76a21a63ae..47a975ee25 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/device/gateway-configuration.component.ts +++ b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-configuration.component.ts @@ -26,7 +26,7 @@ import { AttributeScope } from '@shared/models/telemetry/telemetry.models'; import { GatewayRemoteConfigurationDialogComponent, GatewayRemoteConfigurationDialogData -} from '@shared/components/dialog/gateway-remote-configuration-dialog'; +} from '@home/components/widget/lib/gateway/gateway-remote-configuration-dialog'; import { DeviceService } from '@core/http/device.service'; import { of } from 'rxjs'; import { mergeMap } from 'rxjs/operators'; diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/device/gateway-connectors.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-connectors.component.html similarity index 100% rename from ui-ngx/src/app/modules/home/components/widget/lib/device/gateway-connectors.component.html rename to ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-connectors.component.html diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/device/gateway-connectors.component.scss b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-connectors.component.scss similarity index 100% rename from ui-ngx/src/app/modules/home/components/widget/lib/device/gateway-connectors.component.scss rename to ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-connectors.component.scss diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/device/gateway-connectors.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-connectors.component.ts similarity index 99% rename from ui-ngx/src/app/modules/home/components/widget/lib/device/gateway-connectors.component.ts rename to ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-connectors.component.ts index 778af21db8..6483535c44 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/device/gateway-connectors.component.ts +++ b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-connectors.component.ts @@ -34,7 +34,7 @@ import { MatSort } from '@angular/material/sort'; import { tap } from 'rxjs/operators'; import { TelemetryWebsocketService } from '@core/ws/telemetry-websocket.service'; import { MatTableDataSource } from '@angular/material/table'; -import { GatewayLogLevel } from '@home/components/widget/lib/device/gateway-configuration.component'; +import { GatewayLogLevel } from '@home/components/widget/lib/gateway/gateway-configuration.component'; import { ActionNotificationShow } from '@core/notification/notification.actions'; import { DialogService } from '@core/services/dialog.service'; import { WidgetContext } from '@home/models/widget-component.models'; diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/device/gateway-logs.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-logs.component.html similarity index 100% rename from ui-ngx/src/app/modules/home/components/widget/lib/device/gateway-logs.component.html rename to ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-logs.component.html diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/device/gateway-logs.component.scss b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-logs.component.scss similarity index 100% rename from ui-ngx/src/app/modules/home/components/widget/lib/device/gateway-logs.component.scss rename to ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-logs.component.scss diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/device/gateway-logs.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-logs.component.ts similarity index 98% rename from ui-ngx/src/app/modules/home/components/widget/lib/device/gateway-logs.component.ts rename to ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-logs.component.ts index d05bc53eaa..a0291a3ee0 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/device/gateway-logs.component.ts +++ b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-logs.component.ts @@ -30,7 +30,7 @@ import { AttributeDatasource } from "@home/models/datasource/attribute-datasourc import { Direction, SortOrder } from "@shared/models/page/sort-order"; import { MatSort } from '@angular/material/sort'; import { MatTableDataSource } from '@angular/material/table'; -import { GatewayLogLevel } from '@home/components/widget/lib/device/gateway-configuration.component'; +import { GatewayLogLevel } from '@home/components/widget/lib/gateway/gateway-configuration.component'; import { DialogService } from '@core/services/dialog.service'; import { WidgetContext } from '@home/models/widget-component.models'; diff --git a/ui-ngx/src/app/shared/components/dialog/gateway-remote-configuration-dialog.html b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-remote-configuration-dialog.html similarity index 100% rename from ui-ngx/src/app/shared/components/dialog/gateway-remote-configuration-dialog.html rename to ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-remote-configuration-dialog.html diff --git a/ui-ngx/src/app/shared/components/dialog/gateway-remote-configuration-dialog.ts b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-remote-configuration-dialog.ts similarity index 100% rename from ui-ngx/src/app/shared/components/dialog/gateway-remote-configuration-dialog.ts rename to ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-remote-configuration-dialog.ts diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/device/gateway-service-rpc.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-service-rpc.component.html similarity index 100% rename from ui-ngx/src/app/modules/home/components/widget/lib/device/gateway-service-rpc.component.html rename to ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-service-rpc.component.html diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/device/gateway-service-rpc.component.scss b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-service-rpc.component.scss similarity index 100% rename from ui-ngx/src/app/modules/home/components/widget/lib/device/gateway-service-rpc.component.scss rename to ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-service-rpc.component.scss diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/device/gateway-service-rpc.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-service-rpc.component.ts similarity index 100% rename from ui-ngx/src/app/modules/home/components/widget/lib/device/gateway-service-rpc.component.ts rename to ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-service-rpc.component.ts diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/device/gateway-statistics.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-statistics.component.html similarity index 100% rename from ui-ngx/src/app/modules/home/components/widget/lib/device/gateway-statistics.component.html rename to ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-statistics.component.html diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/device/gateway-statistics.component.scss b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-statistics.component.scss similarity index 100% rename from ui-ngx/src/app/modules/home/components/widget/lib/device/gateway-statistics.component.scss rename to ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-statistics.component.scss diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/device/gateway-statistics.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-statistics.component.ts similarity index 100% rename from ui-ngx/src/app/modules/home/components/widget/lib/device/gateway-statistics.component.ts rename to ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-statistics.component.ts diff --git a/ui-ngx/src/app/modules/home/components/widget/widget-components.module.ts b/ui-ngx/src/app/modules/home/components/widget/widget-components.module.ts index cad3d0b038..7f509be51d 100644 --- a/ui-ngx/src/app/modules/home/components/widget/widget-components.module.ts +++ b/ui-ngx/src/app/modules/home/components/widget/widget-components.module.ts @@ -43,12 +43,15 @@ import { HomePageWidgetsModule } from '@home/components/widget/lib/home-page/hom import { WIDGET_COMPONENTS_MODULE_TOKEN } from '@home/components/tokens'; import { FlotWidgetComponent } from '@home/components/widget/lib/flot-widget.component'; import { LegendComponent } from '@home/components/widget/lib/legend.component'; -import { GatewayConnectorComponent } from '@home/components/widget/lib/device/gateway-connectors.component'; -import { GatewayLogsComponent } from '@home/components/widget/lib/device/gateway-logs.component'; -import { GatewayStatisticsComponent } from '@home/components/widget/lib/device/gateway-statistics.component'; -import { GatewayServiceRPCComponent } from '@home/components/widget/lib/device/gateway-service-rpc.component'; -import { DeviceGatewayCommandComponent } from '@home/components/widget/lib/device/device-gateway-command.component'; -import { GatewayConfigurationComponent } from '@home/components/widget/lib/device/gateway-configuration.component'; +import { GatewayConnectorComponent } from '@home/components/widget/lib/gateway/gateway-connectors.component'; +import { GatewayLogsComponent } from '@home/components/widget/lib/gateway/gateway-logs.component'; +import { GatewayStatisticsComponent } from '@home/components/widget/lib/gateway/gateway-statistics.component'; +import { GatewayServiceRPCComponent } from '@home/components/widget/lib/gateway/gateway-service-rpc.component'; +import { DeviceGatewayCommandComponent } from '@home/components/widget/lib/gateway/device-gateway-command.component'; +import { GatewayConfigurationComponent } from '@home/components/widget/lib/gateway/gateway-configuration.component'; +import { + GatewayRemoteConfigurationDialogComponent +} from '@home/components/widget/lib/gateway/gateway-remote-configuration-dialog'; @NgModule({ declarations: @@ -78,7 +81,8 @@ import { GatewayConfigurationComponent } from '@home/components/widget/lib/devic GatewayStatisticsComponent, GatewayServiceRPCComponent, DeviceGatewayCommandComponent, - GatewayConfigurationComponent + GatewayConfigurationComponent, + GatewayRemoteConfigurationDialogComponent ], imports: [ CommonModule, @@ -112,7 +116,8 @@ import { GatewayConfigurationComponent } from '@home/components/widget/lib/devic GatewayStatisticsComponent, GatewayServiceRPCComponent, DeviceGatewayCommandComponent, - GatewayConfigurationComponent + GatewayConfigurationComponent, + GatewayRemoteConfigurationDialogComponent ], providers: [ {provide: WIDGET_COMPONENTS_MODULE_TOKEN, useValue: WidgetComponentsModule } diff --git a/ui-ngx/src/app/shared/shared.module.ts b/ui-ngx/src/app/shared/shared.module.ts index 4de39b89b5..220a7bc4c4 100644 --- a/ui-ngx/src/app/shared/shared.module.ts +++ b/ui-ngx/src/app/shared/shared.module.ts @@ -177,7 +177,6 @@ import { NotificationComponent } from '@shared/components/notification/notificat import { TemplateAutocompleteComponent } from '@shared/components/notification/template-autocomplete.component'; import { SlackConversationAutocompleteComponent } from '@shared/components/slack-conversation-autocomplete.component'; import { DateAgoPipe } from '@shared/pipe/date-ago.pipe'; -import { GatewayRemoteConfigurationDialogComponent } from '@shared/components/dialog/gateway-remote-configuration-dialog'; import { TbBreakPointsProvider, MdLgLayoutDirective, @@ -264,7 +263,6 @@ export const MarkedOptionsFactory = (markedOptionsService: MarkedOptionsService) HelpComponent, HelpMarkdownComponent, HelpPopupComponent, - GatewayRemoteConfigurationDialogComponent, TbCheckboxComponent, TbSnackBarComponent, TbErrorComponent, @@ -443,7 +441,6 @@ export const MarkedOptionsFactory = (markedOptionsService: MarkedOptionsService) HelpComponent, HelpMarkdownComponent, HelpPopupComponent, - GatewayRemoteConfigurationDialogComponent, TbCheckboxComponent, TbErrorComponent, TbCheatSheetComponent,