From 127c5dd808e22f87a58fe8dfcda944f314c0d381 Mon Sep 17 00:00:00 2001
From: Stuart <stuartthomson@users.noreply.github.com>
Date: Mon, 14 Oct 2019 17:26:15 +0100
Subject: [PATCH] Add networks information to containers (#1344)

* Add networks information to containers to allow grouping by network
---
 package.json                                  | 3 +++
 src/tree/containers/ContainerGroupTreeItem.ts | 3 +++
 src/tree/containers/ContainerProperties.ts    | 3 ++-
 src/tree/containers/ContainersTreeItem.ts     | 2 ++
 src/tree/containers/LocalContainerInfo.ts     | 4 ++++
 5 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index e7dc8e384c..756e55d11a 100644
--- a/package.json
+++ b/package.json
@@ -1101,6 +1101,7 @@
                         "CreatedTime",
                         "FullTag",
                         "ImageId",
+                        "Networks",
                         "None",
                         "Ports",
                         "Registry",
@@ -1127,6 +1128,7 @@
                             "CreatedTime",
                             "FullTag",
                             "ImageId",
+                            "Networks",
                             "Ports",
                             "Registry",
                             "Repository",
@@ -1148,6 +1150,7 @@
                         "CreatedTime",
                         "FullTag",
                         "ImageId",
+                        "Networks",
                         "Ports",
                         "Registry",
                         "Repository",
diff --git a/src/tree/containers/ContainerGroupTreeItem.ts b/src/tree/containers/ContainerGroupTreeItem.ts
index 05275ca70c..8a07769372 100644
--- a/src/tree/containers/ContainerGroupTreeItem.ts
+++ b/src/tree/containers/ContainerGroupTreeItem.ts
@@ -19,6 +19,9 @@ export class ContainerGroupTreeItem extends LocalGroupTreeItemBase<LocalContaine
         switch (this.parent.groupBySetting) {
             case 'ContainerId':
             case 'ContainerName':
+            case 'Networks':
+                icon = 'network';
+                break;
             case 'Ports':
             case 'Status':
                 icon = 'applicationGroup';
diff --git a/src/tree/containers/ContainerProperties.ts b/src/tree/containers/ContainerProperties.ts
index d1a53f48b8..a0ece0322c 100644
--- a/src/tree/containers/ContainerProperties.ts
+++ b/src/tree/containers/ContainerProperties.ts
@@ -7,12 +7,13 @@ import { getThemedIconPath, IconPath } from "../IconPath";
 import { imageProperties, ImageProperty } from "../images/ImageProperties";
 import { ITreePropertyInfo } from "../settings/ITreeSettingInfo";
 
-export type ContainerProperty = ImageProperty | 'ContainerId' | 'ContainerName' | 'Ports' | 'State' | 'Status';
+export type ContainerProperty = ImageProperty | 'ContainerId' | 'ContainerName' | 'Networks' | 'Ports' | 'State' | 'Status';
 
 export const containerProperties: ITreePropertyInfo<ContainerProperty>[] = [
     ...imageProperties,
     { property: 'ContainerId', exampleValue: 'fdeab20e859d' },
     { property: 'ContainerName', exampleValue: 'amazing_hoover' },
+    { property: 'Networks', exampleValue: 'mybridge_network' },
     { property: 'Ports', exampleValue: '8080' },
     { property: 'State', exampleValue: 'exited' },
     { property: 'Status', exampleValue: 'Exited (0) 2 hours ago' }
diff --git a/src/tree/containers/ContainersTreeItem.ts b/src/tree/containers/ContainersTreeItem.ts
index 0c3916de20..6acdf4329c 100644
--- a/src/tree/containers/ContainersTreeItem.ts
+++ b/src/tree/containers/ContainersTreeItem.ts
@@ -57,6 +57,8 @@ export class ContainersTreeItem extends LocalRootTreeItemBase<LocalContainerInfo
                 return item.containerId.slice(0, 12);
             case 'ContainerName':
                 return item.containerName;
+            case 'Networks':
+                return item.networks.length > 0 ? item.networks.join(',') : '<none>';
             case 'Ports':
                 return item.ports.length > 0 ? item.ports.join(',') : '<none>';
             case 'State':
diff --git a/src/tree/containers/LocalContainerInfo.ts b/src/tree/containers/LocalContainerInfo.ts
index 8ec66c90b8..b72220553c 100644
--- a/src/tree/containers/LocalContainerInfo.ts
+++ b/src/tree/containers/LocalContainerInfo.ts
@@ -35,6 +35,10 @@ export class LocalContainerInfo implements ILocalImageInfo {
         return this.data.ImageID;
     }
 
+    public get networks(): string[] {
+        return Object.keys(this.data.NetworkSettings.Networks);
+    }
+
     public get ports(): number[] {
         return this.data.Ports.map(p => p.PublicPort);
     }