Merge pull request #173 from OS2iot/feature/IoT-1585_LimitGatewaysMap

Feature/IoT-1585 limit gateways map

Author: augusthjerrild

src/app/applications/application-detail/application-detail.component.ts

@@ -10,7 +10,7 @@ import { DropdownButton } from "@shared/models/dropdown-button.model";
 import { MeService } from "@shared/services/me.service";
 import { Subscription } from "rxjs";
 import { OrganizationAccessScope } from "@shared/enums/access-scopes";
-import { IotDevicesApplicationMapResponse, IotDevicesResponse } from "@applications/iot-devices/iot-device.model";
+import { IotDevicesApplicationMapResponse } from "@applications/iot-devices/iot-device.model";
 import { RestService } from "@shared/services/rest.service";
 import { Observable } from "rxjs";
 import { map } from "rxjs/operators";
@@ -126,11 +126,7 @@ export class ApplicationDetailComponent implements OnInit, OnDestroy, AfterViewI
 
   private getGateways(): void {
     this.gatewaysSubscription = this.chirpstackGatewayService
-      .getMultiple({
-        limit: null,
-        offset: null,
-        sort: null,
-      })
+      .getForMaps()
       .subscribe((gateways: GatewayResponseMany) => {
         this.gateways = gateways.resultList;
         this.mapGatewaysToCoordinateList();

src/app/gateway/gateway-overview/gateway-tabs/gateway-map/gateway-map.component.ts

@@ -42,26 +42,17 @@ export class GatewayMapComponent implements OnInit, OnDestroy, AfterViewInit {
   }
 
   private getGateways(): void {
-    this.gatewaySubscription = this.chirpstackGatewayService
-      .getMultiple({
-        limit: null,
-        offset: null,
-        sort: null,
-      })
-      .subscribe((gateways: GatewayResponseMany) => {
-        this.gateways = gateways.resultList;
-        this.mapToCoordinateList();
-        this.setCanEdit();
-        this.isLoadingResults = false;
-      });
+    this.gatewaySubscription = this.chirpstackGatewayService.getForMaps().subscribe((gateways: GatewayResponseMany) => {
+      this.gateways = gateways.resultList;
+      this.mapToCoordinateList();
+      this.setCanEdit();
+      this.isLoadingResults = false;
+    });
   }
 
   private getGatewayWith(orgId: number): void {
     this.gatewaySubscription = this.chirpstackGatewayService
-      .getMultiple({
-        limit: null,
-        offset: null,
-        sort: null,
+      .getForMaps({
         organizationId: orgId,
       })
       .subscribe((gateways: GatewayResponseMany) => {

src/app/shared/services/chirpstack-gateway.service.ts

@@ -61,6 +61,19 @@ export class ChirpstackGatewayService {
     );
   }
 
+  public getForMaps(params = {}): Observable<GatewayResponseMany> {
+    return this.restService.get(`${this.chripstackGatewayUrl}/getAllForMaps`, params).pipe(
+      map((response: GatewayResponseMany) => {
+        response.resultList.map(gateway => {
+          gateway.organizationName = this.sharedVariableService
+            .getOrganizationInfo()
+            .find(org => org.id === gateway.organizationId)?.name;
+        });
+        return response;
+      })
+    );
+  }
+
   public post(gateway: Gateway): Observable<GatewayData> {
     const gatewayRequest: GatewayRequest = new GatewayRequest();
     gatewayRequest.gateway = gateway;