diff --git a/ui-ngx/src/app/core/services/menu.models.ts b/ui-ngx/src/app/core/services/menu.models.ts index e565a91755..ee4c36b6f2 100644 --- a/ui-ngx/src/app/core/services/menu.models.ts +++ b/ui-ngx/src/app/core/services/menu.models.ts @@ -88,7 +88,6 @@ export enum MenuId { devices = 'devices', assets = 'assets', entity_views = 'entity_views', - gateways = 'gateways', profiles = 'profiles', device_profiles = 'device_profiles', asset_profiles = 'asset_profiles', @@ -509,16 +508,6 @@ export const menuSectionMap = new Map([ icon: 'view_quilt' } ], - [ - MenuId.gateways, - { - id: MenuId.gateways, - name: 'gateway.gateways', - type: 'link', - path: '/entities/gateways', - icon: 'device_hub' - } - ], [ MenuId.profiles, { @@ -736,8 +725,7 @@ const defaultUserMenuMap = new Map([ pages: [ {id: MenuId.devices}, {id: MenuId.assets}, - {id: MenuId.entity_views}, - {id: MenuId.gateways} + {id: MenuId.entity_views} ] }, { diff --git a/ui-ngx/src/app/modules/home/pages/gateways/gateways.component.scss b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/modbus/modbus-basic-config/modbus-basic-config.component.scss similarity index 97% rename from ui-ngx/src/app/modules/home/pages/gateways/gateways.component.scss rename to ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/modbus/modbus-basic-config/modbus-basic-config.component.scss index 96eb1b3ac5..3b7e7288c8 100644 --- a/ui-ngx/src/app/modules/home/pages/gateways/gateways.component.scss +++ b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/modbus/modbus-basic-config/modbus-basic-config.component.scss @@ -14,6 +14,5 @@ * limitations under the License. */ :host { - width: 100%; height: 100%; } diff --git a/ui-ngx/src/app/modules/home/pages/gateways/gateways.module.ts b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/pipes/rpc-template-array-view.pipe.ts similarity index 51% rename from ui-ngx/src/app/modules/home/pages/gateways/gateways.module.ts rename to ui-ngx/src/app/modules/home/components/widget/lib/gateway/pipes/rpc-template-array-view.pipe.ts index 12aef0cf75..f565195b76 100644 --- a/ui-ngx/src/app/modules/home/pages/gateways/gateways.module.ts +++ b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/pipes/rpc-template-array-view.pipe.ts @@ -14,24 +14,15 @@ /// limitations under the License. /// -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { SharedModule } from '@app/shared/shared.module'; -import { HomeComponentsModule } from '@modules/home/components/home-components.module'; -import { GatewaysComponent } from '@home/pages/gateways/gateways.component'; -import { GatewaysRoutingModule } from '@home/pages/gateways/gateways-routing.module'; +import { Pipe, PipeTransform } from '@angular/core'; - -@NgModule({ - declarations: - [ - GatewaysComponent - ], - imports: [ - CommonModule, - SharedModule, - HomeComponentsModule, - GatewaysRoutingModule - ] +@Pipe({ + name: 'getRpcTemplateArrayView', + standalone: true, }) -export class GatewaysModule { } +export class RpcTemplateArrayViewPipe implements PipeTransform { + + transform(values: {value: string | boolean | number}[]): string { + return values.map(({value}) => value.toString()).join(', '); + } +} diff --git a/ui-ngx/src/app/modules/home/pages/gateways/gateways-routing.module.ts b/ui-ngx/src/app/modules/home/pages/gateways/gateways-routing.module.ts deleted file mode 100644 index 3c823ce66d..0000000000 --- a/ui-ngx/src/app/modules/home/pages/gateways/gateways-routing.module.ts +++ /dev/null @@ -1,55 +0,0 @@ -/// -/// Copyright © 2016-2024 The Thingsboard Authors -/// -/// Licensed under the Apache License, Version 2.0 (the "License"); -/// you may not use this file except in compliance with the License. -/// You may obtain a copy of the License at -/// -/// http://www.apache.org/licenses/LICENSE-2.0 -/// -/// Unless required by applicable law or agreed to in writing, software -/// distributed under the License is distributed on an "AS IS" BASIS, -/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -/// See the License for the specific language governing permissions and -/// limitations under the License. -/// - -import { inject, NgModule } from '@angular/core'; -import { ActivatedRouteSnapshot, ResolveFn, RouterModule, RouterStateSnapshot, Routes } from '@angular/router'; -import { Authority } from '@shared/models/authority.enum'; -import { Dashboard } from '@shared/models/dashboard.models'; -import { ResourcesService } from '@core/services/resources.service'; -import { Observable } from 'rxjs'; -import { MenuId } from '@core/services/menu.models'; -import { GatewaysComponent } from '@home/pages/gateways/gateways.component'; - -const gatewaysDashboardJson = '/api/resource/dashboard/system/gateways_dashboard.json'; - -export const gatewaysDashboardResolver: ResolveFn = ( - route: ActivatedRouteSnapshot, - state: RouterStateSnapshot, - resourcesService = inject(ResourcesService) -): Observable => resourcesService.loadJsonResource(gatewaysDashboardJson); - -const routes: Routes = [ - { - path: 'entities/gateways', - component: GatewaysComponent, - data: { - auth: [Authority.TENANT_ADMIN], - title: 'gateway.gateways', - breadcrumb: { - menuId: MenuId.gateways - } - }, - resolve: { - gatewaysDashboard: gatewaysDashboardResolver - } - } -]; - -@NgModule({ - imports: [RouterModule.forChild(routes)], - exports: [RouterModule] -}) -export class GatewaysRoutingModule { } diff --git a/ui-ngx/src/app/modules/home/pages/gateways/gateways.component.ts b/ui-ngx/src/app/modules/home/pages/gateways/gateways.component.ts deleted file mode 100644 index 9e8d6e4c7c..0000000000 --- a/ui-ngx/src/app/modules/home/pages/gateways/gateways.component.ts +++ /dev/null @@ -1,37 +0,0 @@ -/// -/// Copyright © 2016-2024 The Thingsboard Authors -/// -/// Licensed under the Apache License, Version 2.0 (the "License"); -/// you may not use this file except in compliance with the License. -/// You may obtain a copy of the License at -/// -/// http://www.apache.org/licenses/LICENSE-2.0 -/// -/// Unless required by applicable law or agreed to in writing, software -/// distributed under the License is distributed on an "AS IS" BASIS, -/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -/// See the License for the specific language governing permissions and -/// limitations under the License. -/// - -import { Component } from '@angular/core'; -import { Store } from '@ngrx/store'; -import { AppState } from '@core/core.state'; -import { PageComponent } from '@shared/components/page.component'; -import { Dashboard } from '@shared/models/dashboard.models'; -import { ActivatedRoute } from '@angular/router'; - -@Component({ - selector: 'tb-gateways', - templateUrl: './gateways.component.html', - styleUrls: ['./gateways.component.scss'] -}) -export class GatewaysComponent extends PageComponent { - - gatewaysDashboard: Dashboard = this.route.snapshot.data.gatewaysDashboard; - - constructor(protected store: Store, - private route: ActivatedRoute) { - super(store); - } -} diff --git a/ui-ngx/src/app/modules/home/pages/home-pages.module.ts b/ui-ngx/src/app/modules/home/pages/home-pages.module.ts index a2253f28e7..0b1a70996e 100644 --- a/ui-ngx/src/app/modules/home/pages/home-pages.module.ts +++ b/ui-ngx/src/app/modules/home/pages/home-pages.module.ts @@ -44,7 +44,6 @@ import { FeaturesModule } from '@home/pages/features/features.module'; import { NotificationModule } from '@home/pages/notification/notification.module'; import { AccountModule } from '@home/pages/account/account.module'; import { ScadaSymbolModule } from '@home/pages/scada-symbol/scada-symbol.module'; -import { GatewaysModule } from '@home/pages/gateways/gateways.module'; @NgModule({ exports: [ @@ -71,7 +70,6 @@ import { GatewaysModule } from '@home/pages/gateways/gateways.module'; DashboardModule, AuditLogModule, ApiUsageModule, - GatewaysModule, OtaUpdateModule, UserModule, VcModule, diff --git a/ui-ngx/src/assets/locale/locale.constant-en_US.json b/ui-ngx/src/assets/locale/locale.constant-en_US.json index bf64ae453d..d4a8cffa53 100644 --- a/ui-ngx/src/assets/locale/locale.constant-en_US.json +++ b/ui-ngx/src/assets/locale/locale.constant-en_US.json @@ -2837,7 +2837,6 @@ "function": "Function" }, "gateway": { - "gateways": "Gateways", "address": "Address", "address-required": "Address required", "add-entry": "Add configuration",