Merge pull request #765 from Senyoret1/simple-fixes

Fixes for the UI code
skycoin · May 15, 2021 · ec8388d · ec8388d
2 parents 08f03ce + 62e75a3
commit ec8388d
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 24 deletions.
diff --git a/static/skywire-manager-src/src/app/app.datatypes.ts b/static/skywire-manager-src/src/app/app.datatypes.ts
@@ -1,9 +1,7 @@
 export class Node {
   label: string;
   localPk: string;
-  tcpAddr: string;
   ip: string;
-  port: string;
   version: string;
   apps: Application[];
   transports: Transport[];

diff --git a/static/skywire-manager-src/src/app/services/node.service.ts b/static/skywire-manager-src/src/app/services/node.service.ts
@@ -498,7 +498,7 @@ export class NodeService {
           node.localPk = response.overview.local_pk;
 
           // Ip.
-          if (response.overview.local_ip && (response.overview.local_ip as string).trim()) {
+          if (response.overview && response.overview.local_ip && (response.overview.local_ip as string).trim()) {
             node.ip = response.overview.local_ip;
           } else {
             node.ip = null;
@@ -508,6 +508,15 @@ export class NodeService {
           const labelInfo = this.storageService.getLabelInfo(node.localPk);
           node.label = labelInfo && labelInfo.label ? labelInfo.label : this.storageService.getDefaultLabel(node);
 
+          // If the node is offline, there if no need for getting the rest of the data.
+          if (!node.online) {
+            node.dmsgServerPk = '';
+            node.roundTripPing = '';
+            nodes.push(node);
+
+            return;
+          }
+
           // Health data.
           node.health = {
             status: 200,
@@ -731,22 +740,6 @@ export class NodeService {
     );
   }
 
-  /**
-   * Gets a part of the node address: the ip or the port.
-   * @param tcpAddr Complete address.
-   * @param part 0 for the ip or 1 for the port.
-   */
-  private getAddressPart(tcpAddr: string, part: number): string {
-    const addressParts = tcpAddr.split(':');
-    let port = tcpAddr;
-
-    if (addressParts && addressParts.length === 2) {
-      port = addressParts[part];
-    }
-
-    return port;
-  }
-
   /**
    * Restarts a node.
    */

diff --git a/static/skywire-manager-src/src/assets/i18n/de.json b/static/skywire-manager-src/src/assets/i18n/de.json
@@ -93,7 +93,6 @@
         "title": "Visor Info",
         "label": "Bezeichnung:",
         "public-key": "Öffentlicher Schlüssel:",
-        "port": "Port:",
         "dmsg-server": "DMSG Server:",
         "ping": "Ping:",
         "node-version": "Visor Version:",

diff --git a/static/skywire-manager-src/src/assets/i18n/de_base.json b/static/skywire-manager-src/src/assets/i18n/de_base.json
@@ -93,7 +93,6 @@
         "title": "Visor Info",
         "label": "Label:",
         "public-key": "Public key:",
-        "port": "Port:",
         "dmsg-server": "DMSG server:",
         "ping": "Ping:",
         "node-version": "Visor version:",

diff --git a/static/skywire-manager-src/src/assets/i18n/en.json b/static/skywire-manager-src/src/assets/i18n/en.json
@@ -97,7 +97,6 @@
         "label": "Label:",
         "public-key": "Public key:",
         "ip": "IP:",
-        "port": "Port:",
         "dmsg-server": "DMSG server:",
         "ping": "Ping:",
         "node-version": "Visor version:",

diff --git a/static/skywire-manager-src/src/assets/i18n/es.json b/static/skywire-manager-src/src/assets/i18n/es.json
@@ -97,7 +97,6 @@
         "label": "Etiqueta:",
         "public-key": "Llave pública:",
         "ip": "IP:",
-        "port": "Puerto:",
         "dmsg-server": "Servidor DMSG:",
         "ping": "Ping:",
         "node-version": "Versión del visor:",

diff --git a/static/skywire-manager-src/src/assets/i18n/es_base.json b/static/skywire-manager-src/src/assets/i18n/es_base.json
@@ -97,7 +97,6 @@
         "label": "Label:",
         "public-key": "Public key:",
         "ip": "IP:",
-        "port": "Port:",
         "dmsg-server": "DMSG server:",
         "ping": "Ping:",
         "node-version": "Visor version:",