dashboard: reduce noise in current kernel version

[pmg-gui.git] / js / dashboard / NodeInfo.js

diff --git a/js/dashboard/NodeInfo.js b/js/dashboard/NodeInfo.js
index bdf8f85e56c16ca9ac399fb6f2114eae73d9d754..1c3cfa344c54bb7ab25427909c3fe91f307498f7 100644 (file)
--- a/js/dashboard/NodeInfo.js
+++ b/js/dashboard/NodeInfo.js
@@ -17,41 +17,6 @@ Ext.define('PMG.NodeInfoPanel', {
        padding: '0 10 5 10',
     },
 
-    viewModel: {
-       data: {
-           subscriptionActive: '',
-           noSubscriptionRepo: '',
-           enterpriseRepo: '',
-           testRepo: '',
-       },
-       formulas: {
-           repoStatus: function(get) {
-               if (get('subscriptionActive') === '' || get('enterpriseRepo') === '') {
-                   return '';
-               }
-
-               if (get('noSubscriptionRepo') || get('testRepo')) {
-                   return 'non-production';
-               } else if (get('subscriptionActive') && get('enterpriseRepo')) {
-                   return 'ok';
-               } else if (!get('subscriptionActive') && get('enterpriseRepo')) {
-                   return 'no-sub';
-               } else if (!get('enterpriseRepo') || !get('noSubscriptionRepo') || !get('testRepo')) {
-                   return 'no-repo';
-               }
-               return 'unknown';
-           },
-           repoStatusMessage: function(get) {
-               const status = get('repoStatus');
-               let repoLink = ` <a data-qtip="${gettext("Open Repositories Panel")}"
-                   href="#pmgServerAdministration:aptrepositories">
-                   <i class="fa black fa-chevron-right txt-shadow-hover"></i>
-                   </a>`;
-               return Proxmox.Utils.formatNodeRepoStatus(status, 'Proxmox Mail Gateway') + repoLink;
-           },
-       },
-    },
-
     items: [
        {
            itemId: 'nodecpu',
@@ -93,7 +58,7 @@ Ext.define('PMG.NodeInfoPanel', {
            title: gettext('HD space') + ' (root)',
            valueField: 'rootfs',
            maxField: 'rootfs',
-           renderer: Proxmox.Utils.render_node_size_usage,
+           renderer: ({ used, total }) => Proxmox.Utils.render_size_usage(used, total, true),
        },
        {
            iconCls: 'pmx-icon-size fa fa-fw fa-refresh',
@@ -119,24 +84,27 @@ Ext.define('PMG.NodeInfoPanel', {
            value: '',
        },
        {
-           itemId: 'kversion',
            colspan: 2,
            title: gettext('Kernel Version'),
            printBar: false,
-           textField: 'kversion',
+           // TODO: remove with next major and only use newish current-kernel textfield
+           multiField: true,
+           //textField: 'current-kernel',
+           renderer: ({ data }) => {
+               if (!data['current-kernel']) {
+                   return data.kversion;
+               }
+               let kernel = data['current-kernel'];
+               let buildDate = kernel.version.match(/\((.+)\)\s*$/)?.[1] ?? 'unknown';
+               return `${kernel.sysname} ${kernel.release} (${buildDate})`;
+           },
            value: '',
        },
        {
+           xtype: 'pmxNodeInfoRepoStatus',
            itemId: 'repositoryStatus',
-           colspan: 2,
-           printBar: false,
-           title: gettext('Repository Status'),
-           setValue: function(value) { // for binding below
-               this.updateValue(value);
-           },
-           bind: {
-               value: '{repoStatusMessage}',
-           },
+           product: 'Proxmox Mail Gateway',
+           repoLink: '#pmgServerAdministration:aptrepositories',
        },
     ],
 
@@ -146,31 +114,6 @@ Ext.define('PMG.NodeInfoPanel', {
        me.setTitle(Proxmox.NodeName + ' (' + gettext('Uptime') + ': ' + uptime + ')');
     },
 
-    setRepositoryInfo: function(standardRepos) {
-       let me = this;
-       let vm = me.getViewModel();
-
-       for (const standardRepo of standardRepos) {
-           const handle = standardRepo.handle;
-           const status = standardRepo.status || 0;
-
-           if (handle === "enterprise") {
-               vm.set('enterpriseRepo', status);
-           } else if (handle === "no-subscription") {
-               vm.set('noSubscriptionRepo', status);
-           } else if (handle === "test") {
-               vm.set('testRepo', status);
-           }
-       }
-    },
-
-    setSubscriptionStatus: function(status) {
-       let me = this;
-       let vm = me.getViewModel();
-
-       vm.set('subscriptionActive', status);
-    },
-
     initComponent: function() {
        let me = this;