feedback changes for metadata on gateways.

Author: AugustHA-Iterator

src/app/gateway/gateway-detail/gateway-detail.component.html

@@ -33,14 +33,14 @@ <h3>{{ 'GATEWAY.LOCATION' | translate }}</h3>
               <app-map [coordinates]="getCoordinates()"></app-map>
             </div>
             <div class="row">
-              <div class="col-4">
-                <p><strong>{{ 'GATEWAY.LONGITUDE' | translate }}</strong>
-                  {{gateway.location?.longitude | number:'2.1-9'}}</p>
-              </div>
               <div class="col-4">
                 <p><strong>{{ 'GATEWAY.LATITUDE' | translate }}</strong>
                   {{gateway.location.latitude | number:'2.1-9'}}</p>
               </div>
+              <div class="col-4">
+                <p><strong>{{ 'GATEWAY.LONGITUDE' | translate }}</strong>
+                  {{gateway.location?.longitude | number:'2.1-9'}}</p>
+              </div>
               <div class="col-4">
                 <p><strong>{{ 'GATEWAY.ALTITUDE' | translate }}</strong>
                   {{gateway.location.altitude | number:'2.1-9'}}</p>

src/app/gateway/gateway-edit/gateway-edit.component.html

@@ -40,14 +40,6 @@
     <p>{{'DBLCLICKINFO' | translate}}</p>
 
     <div class="row mb-5">
-      <div class="form-group mt-3 col-6">
-        <label class="form-label" for="longitude">{{ 'GATEWAY.LONGITUDE' | translate }}</label>
-        <input type="number" class="form-control" id="longitude" name="longitude" [placeholder]="'00'" required
-               [(ngModel)]="gateway.location.longitude" step=".000001" min="-180" max="180" maxlength="12"
-               (keyup)="onCoordinateKey($event)"
-               [ngClass]="{'is-invalid' : formFailedSubmit && errorFields.includes('longitude'), 'is-valid' : formFailedSubmit && !errorFields.includes('longitude')}">
-      </div>
-
       <div class="form-group mt-3 col-6">
         <label class="form-label" for="location.latitude">{{ 'GATEWAY.LATITUDE' | translate }}</label>
         <input type="number" class="form-control" id="location.latitude" name="location.latitude" [placeholder]="'00'"
@@ -56,6 +48,14 @@
                [ngClass]="{'is-invalid' : formFailedSubmit && errorFields.includes('latitude'), 'is-valid' : formFailedSubmit && !errorFields.includes('latitude')}">
       </div>
 
+      <div class="form-group mt-3 col-6">
+        <label class="form-label" for="longitude">{{ 'GATEWAY.LONGITUDE' | translate }}</label>
+        <input type="number" class="form-control" id="longitude" name="longitude" [placeholder]="'00'" required
+               [(ngModel)]="gateway.location.longitude" step=".000001" min="-180" max="180" maxlength="12"
+               (keyup)="onCoordinateKey($event)"
+               [ngClass]="{'is-invalid' : formFailedSubmit && errorFields.includes('longitude'), 'is-valid' : formFailedSubmit && !errorFields.includes('longitude')}">
+      </div>
+
       <div class="form-group mt-3 col-6">
         <label class="form-label" for="altitude">{{ 'GATEWAY.ALTITUDE' | translate }}</label>
         <input type="number" class="form-control" id="altitude" name="altitude" [placeholder]="00" required

src/app/gateway/gateway-table/gateway-table.component.ts

@@ -76,42 +76,12 @@ const columnDefinitions: TableColumn[] = [
         toggleable: true,
         default: false,
     },
-    {
-        id: "gatewayResponsibleEmail",
-        display: "LORA-GATEWAY-TABLE.RESPONSIBLE-EMAIL",
-        toggleable: true,
-        default: false,
-    },
-    {
-        id: "gatewayResponsiblePhoneNumber",
-        display: "LORA-GATEWAY-TABLE.RESPONSIBLE-PHONE-NUMBER",
-        toggleable: true,
-        default: false,
-    },
-    {
-        id: "operationalResponsibleName",
-        display: "LORA-GATEWAY-TABLE.OPERATIONAL-NAME",
-        toggleable: true,
-        default: false,
-    },
-    {
-        id: "operationalResponsibleEmail",
-        display: "LORA-GATEWAY-TABLE.OPERATIONAL-EMAIL",
-        toggleable: true,
-        default: false,
-    },
     {
         id: "tags",
         display: "LORA-GATEWAY-TABLE.TAGS",
         toggleable: true,
         default: false,
     },
-    {
-        id: "location",
-        display: "LORA-GATEWAY-TABLE.LOCATION",
-        toggleable: true,
-        default: false,
-    },
     {
         id: "createdAt",
         display: "LORA-GATEWAY-TABLE.CREATED-AT",

src/app/gateway/gateway.model.ts

@@ -19,7 +19,7 @@ export class Gateway extends EditPermission {
     operationalResponsibleName?: string;
     operationalResponsibleEmail?: string;
 
-    tagsString = "{}";
+    tagsString: string;
     tags?: JSON;
     rxPacketsReceived: number;
     txPacketsEmitted: number;

src/app/shared/components/map/map.component.ts

@@ -121,11 +121,17 @@ export class MapComponent implements OnInit, AfterViewInit, OnChanges, OnDestroy
             const gatewayLayerGroup = [];
 
             this.coordinateList.forEach(coord => {
-                if (!coord.markerInfo.isDevice) {
-                    gatewayLayerGroup.push(
-                        this.addMarker(coord.latitude, coord.longitude, coord.draggable, coord.markerInfo)
-                    );
-                    this.markers = L.layerGroup(gatewayLayerGroup).addTo(this.map);
+                if (this.isFromApplication) {
+                    if (!coord.markerInfo.isDevice) {
+                        gatewayLayerGroup.push(
+                            this.addMarker(coord.latitude, coord.longitude, coord.draggable, coord.markerInfo)
+                        );
+                        this.markers = L.layerGroup(gatewayLayerGroup).addTo(this.map);
+                    } else {
+                        clusterGroup.addLayer(
+                            this.addMarker(coord.latitude, coord.longitude, coord.draggable, coord.markerInfo)
+                        );
+                    }
                 } else {
                     clusterGroup.addLayer(
                         this.addMarker(coord.latitude, coord.longitude, coord.draggable, coord.markerInfo)

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

@@ -28,8 +28,11 @@ export class ChirpstackGatewayService {
                     .getOrganizationInfo()
                     .find(org => org.id === response.gateway.organizationId)?.name;
 
+                // We want to show helper text if tags is empty. To show empty text, the tagsString has to be undefined.
+                response.gateway.tagsString =
+                    Object.keys(response.gateway.tags).length === 0 ? undefined : JSON.stringify(response.gateway.tags);
+
                 // Move createdat and updatedat to next level ease the use.
-                response.gateway.tagsString = JSON.stringify(response.gateway.tags);
                 response.gateway.createdByName = this.userMinimalService.getUserNameFrom(response.gateway.createdBy);
 
                 response.gateway.updatedByName = this.userMinimalService.getUserNameFrom(response.gateway.updatedBy);

src/assets/i18n/da.json

@@ -384,7 +384,7 @@
     "RESPONSIBLE-NAME": "Gateway-ansvarlig",
     "RESPONSIBLE-EMAIL": "Kontaktmail",
     "RESPONSIBLE-PHONE-NUMBER": "Kontakttelefon",
-    "OPERATIONAL-NAME": "Driftansvarlig",
+    "OPERATIONAL-NAME": "Driftsansvarlig",
     "OPERATIONAL-EMAIL": "Kontaktmail - drift",
     "TAGS": "Tags",
     "CREATED-AT": "Oprettelsesdato"
@@ -828,7 +828,7 @@
     "GATEWAYID": "Gateway id (EUI)",
     "GATEWAYID-PLACEHOLDER": "0000000000000000",
     "METADATA": "Gateway tags",
-    "METADATA-PLACEHOLDER": "Angiv JSON her",
+    "METADATA-PLACEHOLDER": "Angiv JSON her: {\"tagName\": \"tagValue\"}",
     "ALTITUDE": "Højde",
     "ALTITUDE-PLACEHOLDER": "00",
     "LONGITUDE": "Længdegrad",
@@ -845,7 +845,7 @@
     "GATEWAY-RESPONSIBLE-CONTACT-PLACEHOLDER": "Angiv mailadresse på gateway-ansvarlig",
     "GATEWAY-RESPONSIBLE-CONTACT-NUMBER": "Kontakttelefon",
     "GATEWAY-RESPONSIBLE-CONTACT-NUMBER-PLACEHOLDER": "Angiv telefonnummer på gateway-ansvarlig",
-    "OPERATION-RESPONSIBLE": "Driftansvarlig",
+    "OPERATION-RESPONSIBLE": "Driftsansvarlig",
     "OPERATION-RESPONSIBLE-PLACEHOLDER": "Angiv ansvarlig for den fysiske drift af gateway",
     "OPERATION-RESPONSIBLE-CONTACT": "Kontaktmail - drift",
     "OPERATION-RESPONSIBLE-CONTACT-PLACEHOLDER": "Angiv mailadresse på driftsansvarlig"