removed orderOn so the backend reads it as undefined. Unwrapped elses

Author: AugustHA-Iterator

src/app/applications/applications-list/applications-table/applications-table.component.ts

@@ -202,15 +202,16 @@ export class ApplicationsTableComponent implements AfterViewInit, OnInit {
 
                             if (valueA === "NONE" && valueB !== "NONE") {
                                 return orderByDirection === "asc" ? 1 : -1;
-                            } else if (valueA !== "NONE" && valueB === "NONE") {
+                            }
+                            if (valueA !== "NONE" && valueB === "NONE") {
                                 return orderByDirection === "asc" ? -1 : 1;
-                            } else {
-                                const translatedA = this.translate.instant("APPLICATION.STATUS." + valueA);
-                                const translatedB = this.translate.instant("APPLICATION.STATUS." + valueB);
-
-                                return translatedA.localeCompare(translatedB) * (orderByDirection === "asc" ? 1 : -1);
                             }
+                            const translatedA = this.translate.instant("APPLICATION.STATUS." + valueA);
+                            const translatedB = this.translate.instant("APPLICATION.STATUS." + valueB);
+
+                            return translatedA.localeCompare(translatedB) * (orderByDirection === "asc" ? 1 : -1);
                         });
+
                         return data;
                     }
                 })

src/app/applications/iot-devices/iot-devices-table/iot-devices-table.component.ts

@@ -185,8 +185,8 @@ export class IotDevicesTableComponent implements AfterViewInit, OnInit {
             })
             .pipe(
                 map((data: IotDevicesResponse) => {
-                  // For some reason, the backend is not capable to sort MQTT_EXTERNAL_BROKER and MQTT_INTERNAL_BROKER.
-                  // Therefore we do it manually in the frontend.
+                    // For some reason, the backend is not capable to sort MQTT_EXTERNAL_BROKER and MQTT_INTERNAL_BROKER.
+                    // Therefore we do it manually in the frontend.
                     if (orderByColumn !== "type") {
                         return data;
                     } else {
@@ -196,11 +196,11 @@ export class IotDevicesTableComponent implements AfterViewInit, OnInit {
 
                             if (valueA < valueB) {
                                 return orderByDirection === "asc" ? -1 : 1;
-                            } else if (valueA > valueB) {
+                            }
+                            if (valueA > valueB) {
                                 return orderByDirection === "asc" ? 1 : -1;
-                            } else {
-                                return 0;
                             }
+                            return 0;
                         });
                         return data;
                     }

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

@@ -47,7 +47,6 @@ export class GatewayMapComponent implements OnInit, OnDestroy, AfterViewInit {
                 limit: null,
                 offset: null,
                 sort: null,
-                orderOn: null,
             })
             .subscribe((gateways: GatewayResponseMany) => {
         this.gateways = gateways.resultList;
@@ -63,7 +62,6 @@ export class GatewayMapComponent implements OnInit, OnDestroy, AfterViewInit {
                 limit: null,
                 offset: null,
                 sort: null,
-                orderOn: null,
                 organizationId: orgId,
             })
             .subscribe((gateways: GatewayResponseMany) => {