folder rearranging

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,

ui-ngx/src/app/modules/home/components/widget/lib/device/gateway-configuration.component.ts → 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';

ui-ngx/src/app/modules/home/components/widget/lib/device/gateway-connectors.component.ts → 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';

ui-ngx/src/app/modules/home/components/widget/lib/device/gateway-logs.component.ts → 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';
 

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 { GatewayConnectorComponent } from '@home/components/widget/lib/gateway/gateway-connectors.component';
-import { GatewayLogsComponent } from '@home/components/widget/lib/device/gateway-logs.component';
+import { GatewayLogsComponent } from '@home/components/widget/lib/gateway/gateway-logs.component';
-import { GatewayStatisticsComponent } from '@home/components/widget/lib/device/gateway-statistics.component';
+import { GatewayStatisticsComponent } from '@home/components/widget/lib/gateway/gateway-statistics.component';
-import { GatewayServiceRPCComponent } from '@home/components/widget/lib/device/gateway-service-rpc.component';
+import { GatewayServiceRPCComponent } from '@home/components/widget/lib/gateway/gateway-service-rpc.component';
-import { DeviceGatewayCommandComponent } from '@home/components/widget/lib/device/device-gateway-command.component';
+import { DeviceGatewayCommandComponent } from '@home/components/widget/lib/gateway/device-gateway-command.component';
-import { GatewayConfigurationComponent } from '@home/components/widget/lib/device/gateway-configuration.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 }

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,