From cb50dd42d816b7a202c3dab5698be9447a7e92e4 Mon Sep 17 00:00:00 2001
From: Joxit <joxit972@gmail.com>
Date: Thu, 13 Dec 2018 20:05:28 +0100
Subject: [PATCH] [fix-image-history] Sort elements attributes (os, id,
 created...)

---
 src/tags/app.tag         |  2 +-
 src/tags/tag-history.tag | 20 +++++++++++++++++++-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/tags/app.tag b/src/tags/app.tag
index 64b2145..c825e42 100644
--- a/src/tags/app.tag
+++ b/src/tags/app.tag
@@ -208,7 +208,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
               return !e.empty_layer;
             }).forEach(function(e, i) {
               e.size = self.layers[i].size;
-              e.id = self.layers[i].digest;
+              e.id = self.layers[i].digest.replace('sha256:', '');
             });
           self.trigger('creation-date', self.creationDate);
           self.trigger('blobs', self.blobs);
diff --git a/src/tags/tag-history.tag b/src/tags/tag-history.tag
index 5682f9d..bf93355 100644
--- a/src/tags/tag-history.tag
+++ b/src/tags/tag-history.tag
@@ -30,7 +30,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
   </div>
 
   <material-card each="{ guiElement in registryUI.taghistory.elements }" class="tag-history-element">
-    <div each="{ entry in guiElement }" class="{ entry.key }">
+    <div each="{ entry in guiElement.sort(registryUI.taghistory.eltSort) }" class="{ entry.key }">
       <div class="headline"><i class="material-icons"></i>
         <p>{ entry.key.replace('_', ' ') }</p>
       </div>
@@ -40,6 +40,24 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
   </material-card>
   <script type="text/javascript">
     registryUI.taghistory.instance = this;
+    registryUI.taghistory.eltIdx = function(e) {
+      switch (e) {
+        case 'id': return 1;
+        case 'created': return 2;
+        case 'created_by': return 3;
+        case 'size': return 4;
+        case 'os': return 5;
+        case 'architecture': return 6;
+        case 'linux': return 7;
+        case 'docker_version': return 8;
+        case 'config': return 9;
+        case 'container_config': return 10;
+        default: return 10;
+      }
+    };
+    registryUI.taghistory.eltSort = function(e1, e2) {
+      return registryUI.taghistory.eltIdx(e1.key) - registryUI.taghistory.eltIdx(e2.key);
+    };
     registryUI.taghistory.display = function() {
       registryUI.taghistory.elements = []
       let oReq = new Http();