Merge branch 'hotfix/service-formatting', prepare 2.1.1

Author: yamalight

src/util/formatServices.js

@@ -4,9 +4,11 @@ module.exports = services =>
     const domain = svc.Config.Labels['traefik.frontend.rule']
       ? svc.Config.Labels['traefik.frontend.rule'].replace('Host:', '')
       : 'Not set';
-    const aliases = svc.NetworkSettings.Networks.exoframe.Aliases
-      ? svc.NetworkSettings.Networks.exoframe.Aliases.filter(alias => !svc.Id.startsWith(alias))
-      : [];
+    const aliases = Object.keys(svc.NetworkSettings.Networks)
+      .map(networkName => svc.NetworkSettings.Networks[networkName])
+      .filter(net => net.Aliases && net.Aliases.length > 0)
+      .map(net => net.Aliases.filter(alias => !svc.Id.startsWith(alias)))
+      .reduce((acc, val) => acc.concat(val), []);
     const project = svc.Config.Labels['exoframe.project'];
     const host = aliases.shift() || 'Not set';
     const status = svc.State ? svc.State.Status : '';

test/__snapshots__/list.test.js.snap

@@ -3,7 +3,7 @@
 exports[`Should get list of deployments 1`] = `
 Array [
   Array [
-    "[32m3 deployments found on http://localhost:8080:[39m
+    "[32m4 deployments found on http://localhost:8080:[39m
 ",
   ],
   Array [
@@ -22,7 +22,8 @@ Array [
   Array [],
   Array [
     "   ID          URL           Hostname       Status          
-   test3       Not set       Not set        Up 13 minutes   ",
+   test3       Not set       Not set        Up 13 minutes   
+   test4       Not set       alias4         Up 10 minutes   ",
   ],
 ]
 `;

test/list.test.js

@@ -61,6 +61,26 @@ const services = [
       },
     },
   },
+  {
+    Id: '444',
+    Name: '/test4',
+    Config: {
+      Labels: {'exoframe.project': 'somethingelse'},
+    },
+    State: {
+      Status: 'Up 10 minutes',
+    },
+    NetworkSettings: {
+      Networks: {
+        default: {
+          Aliases: null,
+        },
+        traefik: {
+          Aliases: ['alias4'],
+        },
+      },
+    },
+  },
 ];
 
 // test removal