sort leases by expires

app/static/assets/js/helper.js

@@ -31,13 +31,13 @@ async function fetchOriginsWithLeases(element) {
                     </tr>`
             table.appendChild(thead)
             let tbody = document.createElement('thead');
-            x.forEach((o) => {
+            x.sort((a, b) => a.hostname.localeCompare(b.hostname)).forEach((o) => {
                 let row = document.createElement('tr');
                 row.innerHTML = `
                         <td><code>${o.origin_ref}</code></td>
                         <td>${o.hostname}</td>
-                        <td>${o.os_platform}</td>
+                        <td>${o.os_platform} (${o.os_version})</td>
-                        <td>${o.os_version}</td>
+                        <td>${o.guest_driver_version}</td>
                         <td>${o.leases.map(x => `<code title="expires: ${x.lease_expires}">${x.lease_ref}</code>`).join(', ')}</td>`
                 tbody.appendChild(row);
             })
@@ -70,7 +70,7 @@ async function fetchLeases(element) {
                     </tr>`
             table.appendChild(thead)
             let tbody = document.createElement('thead');
-            x.forEach((o) => {
+            x.sort((a, b) => new Date(a.lease_expires) - new Date(b.lease_expires)).forEach((o) => {
                 let row = document.createElement('tr');
                 row.innerHTML = `
                         <td><code>${o.lease_ref}</code></td>