From b9fe8009dd6b1351ac7bc458967baeed48d1ffe2 Mon Sep 17 00:00:00 2001
From: DarkAEther <30438425+DarkAEther@users.noreply.github.com>
Date: Mon, 11 Jan 2021 08:05:19 +0530
Subject: [PATCH] feat(image-details): Show labels in images datatable (#4287)

* feat(images): show labels in images datatable

* move labels to image details view
---
 app/docker/models/image.js              |  2 +-
 app/docker/models/imageDetails.js       |  1 +
 app/docker/views/images/edit/image.html | 11 +++++++++++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/app/docker/models/image.js b/app/docker/models/image.js
index 414e0b77d..b0d2417e9 100644
--- a/app/docker/models/image.js
+++ b/app/docker/models/image.js
@@ -4,7 +4,6 @@ export function ImageViewModel(data) {
   this.Repository = data.Repository;
   this.Created = data.Created;
   this.Checked = false;
-
   this.RepoTags = data.RepoTags;
   if (!this.RepoTags && data.RepoDigests) {
     this.RepoTags = [];
@@ -21,6 +20,7 @@ export function ImageViewModel(data) {
   if (data.Portainer && data.Portainer.Agent && data.Portainer.Agent.NodeName) {
     this.NodeName = data.Portainer.Agent.NodeName;
   }
+  this.Labels = data.Labels;
 }
 
 export function ImageBuildModel(data) {
diff --git a/app/docker/models/imageDetails.js b/app/docker/models/imageDetails.js
index 8e8285ca7..50fbdebba 100644
--- a/app/docker/models/imageDetails.js
+++ b/app/docker/models/imageDetails.js
@@ -16,4 +16,5 @@ export function ImageDetailsViewModel(data) {
   this.ExposedPorts = data.ContainerConfig.ExposedPorts ? Object.keys(data.ContainerConfig.ExposedPorts) : [];
   this.Volumes = data.ContainerConfig.Volumes ? Object.keys(data.ContainerConfig.Volumes) : [];
   this.Env = data.ContainerConfig.Env ? data.ContainerConfig.Env : [];
+  this.Labels = data.ContainerConfig.Labels;
 }
diff --git a/app/docker/views/images/edit/image.html b/app/docker/views/images/edit/image.html
index ba3de195a..b8a686edb 100644
--- a/app/docker/views/images/edit/image.html
+++ b/app/docker/views/images/edit/image.html
@@ -128,6 +128,17 @@
               <td>Build</td>
               <td>Docker {{ image.DockerVersion }} on {{ image.Os }}, {{ image.Architecture }}</td>
             </tr>
+            <tr ng-if="!(image.Labels | emptyobject)">
+              <td>Labels</td>
+              <td>
+                <table class="table table-bordered table-condensed">
+                  <tr ng-repeat="(k, v) in image.Labels">
+                    <td>{{ k }}</td>
+                    <td>{{ v }}</td>
+                  </tr>
+                </table>
+              </td>
+            </tr>
             <tr ng-if="image.Author">
               <td>Author</td>
               <td>{{ image.Author }}</td>