]> git.proxmox.com Git - proxmox-widget-toolkit.git/blobdiff - src/node/APTRepositories.js
ui: repo status: adapt flex-ratio and center health vertically
[proxmox-widget-toolkit.git] / src / node / APTRepositories.js
index fd4a35003d7fee0bb60b5fe46893fbdec1dfff1b..5c1091b46758f555bb981606a39c8cf761c30f24 100644 (file)
@@ -3,7 +3,7 @@ Ext.define('apt-repolist', {
     fields: [
        'Path',
        'Index',
-       'OfficialHost',
+       'Origin',
        'FileType',
        'Enabled',
        'Comment',
@@ -15,30 +15,124 @@ Ext.define('apt-repolist', {
     ],
 });
 
+Ext.define('Proxmox.window.APTRepositoryAdd', {
+    extend: 'Proxmox.window.Edit',
+    alias: 'widget.pmxAPTRepositoryAdd',
+
+    isCreate: true,
+    isAdd: true,
+
+    subject: gettext('Repository'),
+    width: 600,
+
+    initComponent: function() {
+       let me = this;
+
+       if (!me.repoInfo || me.repoInfo.length === 0) {
+           throw "repository information not initialized";
+       }
+
+       let description = Ext.create('Ext.form.field.Display', {
+           fieldLabel: gettext('Description'),
+           name: 'description',
+       });
+
+       let status = Ext.create('Ext.form.field.Display', {
+           fieldLabel: gettext('Status'),
+           name: 'status',
+           renderer: function(value) {
+               let statusText = gettext('Not yet configured');
+               if (value !== '') {
+                   statusText = Ext.String.format(
+                       '{0}: {1}',
+                       gettext('Configured'),
+                       value ? gettext('enabled') : gettext('disabled'),
+                   );
+               }
+
+               return statusText;
+           },
+       });
+
+       let repoSelector = Ext.create('Proxmox.form.KVComboBox', {
+           fieldLabel: gettext('Repository'),
+           xtype: 'proxmoxKVComboBox',
+           name: 'handle',
+           allowBlank: false,
+           comboItems: me.repoInfo.map(info => [info.handle, info.name]),
+           validator: function(renderedValue) {
+               let handle = this.value;
+               // we cannot use this.callParent in instantiations
+               let valid = Proxmox.form.KVComboBox.prototype.validator.call(this, renderedValue);
+
+               if (!valid || !handle) {
+                   return false;
+               }
+
+               const info = me.repoInfo.find(elem => elem.handle === handle);
+               if (!info) {
+                   return false;
+               }
+
+               if (info.status) {
+                   return Ext.String.format(gettext('{0} is already configured'), renderedValue);
+               }
+               return valid;
+           },
+           listeners: {
+               change: function(f, value) {
+                   const info = me.repoInfo.find(elem => elem.handle === value);
+                   description.setValue(info.description);
+                   status.setValue(info.status);
+               },
+           },
+       });
+
+       repoSelector.setValue(me.repoInfo[0].handle);
+
+       Ext.apply(me, {
+           items: [
+               repoSelector,
+               description,
+               status,
+           ],
+           repoSelector: repoSelector,
+       });
+
+       me.callParent();
+    },
+});
+
 Ext.define('Proxmox.node.APTRepositoriesErrors', {
     extend: 'Ext.grid.GridPanel',
 
     xtype: 'proxmoxNodeAPTRepositoriesErrors',
 
-    title: gettext('Errors'),
-
     store: {},
 
+    scrollable: true,
+
     viewConfig: {
        stripeRows: false,
-       getRowClass: () => 'proxmox-invalid-row',
+       getRowClass: (record) => {
+           switch (record.data.status) {
+               case 'warning': return 'proxmox-warning-row';
+               case 'critical': return 'proxmox-invalid-row';
+               default: return '';
+           }
+       },
     },
 
+    hideHeaders: true,
+
     columns: [
        {
-           header: gettext('File'),
-           dataIndex: 'path',
-           renderer: value => `<i class='pve-grid-fa fa fa-fw fa-exclamation-triangle'></i>${value}`,
-           width: 350,
+           dataIndex: 'status',
+           renderer: (value) => `<i class="fa fa-fw ${Proxmox.Utils.get_health_icon(value, true)}"></i>`,
+           width: 50,
        },
        {
-           header: gettext('Error'),
-           dataIndex: 'error',
+           dataIndex: 'message',
            flex: 1,
        },
     ],
@@ -52,6 +146,8 @@ Ext.define('Proxmox.node.APTRepositoriesGrid', {
 
     cls: 'proxmox-apt-repos', // to allow applying styling to general components with local effect
 
+    border: false,
+
     tbar: [
        {
            text: gettext('Reload'),
@@ -63,10 +159,31 @@ Ext.define('Proxmox.node.APTRepositoriesGrid', {
        },
        {
            text: gettext('Add'),
-           menu: {
-               plain: true,
-               itemId: "addMenu",
-               items: [],
+           id: 'addButton',
+           disabled: true,
+           repoInfo: undefined,
+           handler: function(button, event, record) {
+               Proxmox.Utils.checked_command(() => {
+                   let me = this;
+                   let panel = me.up('proxmoxNodeAPTRepositories');
+
+                   let extraParams = {};
+                   if (panel.digest !== undefined) {
+                      extraParams.digest = panel.digest;
+                   }
+
+                   Ext.create('Proxmox.window.APTRepositoryAdd', {
+                       repoInfo: me.repoInfo,
+                       url: `/api2/extjs/nodes/${panel.nodename}/apt/repositories`,
+                       method: 'PUT',
+                       extraRequestParams: extraParams,
+                       listeners: {
+                           destroy: function() {
+                               panel.reload();
+                           },
+                       },
+                   }).show();
+               });
            },
        },
        '-',
@@ -77,6 +194,9 @@ Ext.define('Proxmox.node.APTRepositoriesGrid', {
            altText: gettext('Disable'),
            id: 'repoEnableButton',
            disabled: true,
+           bind: {
+               text: '{enableButtonText}',
+           },
            handler: function(button, event, record) {
                let me = this;
                let panel = me.up('proxmoxNodeAPTRepositories');
@@ -120,30 +240,19 @@ Ext.define('Proxmox.node.APTRepositoriesGrid', {
     ],
 
     sortableColumns: false,
+    viewConfig: {
+       stripeRows: false,
+       getRowClass: (record, index) => record.get('Enabled') ? '' : 'proxmox-disabled-row',
+    },
 
     columns: [
        {
-           header: gettext('Official'),
-           dataIndex: 'OfficialHost',
-           renderer: function(value, cell, record) {
-               let icon = (cls) => `<i class="fa fa-fw ${cls}"></i>`;
-
-               const enabled = record.data.Enabled;
-
-               if (value === undefined || value === null) {
-                   return icon('fa-question-circle-o');
-               }
-               if (!value) {
-                   return icon('fa-times ' + (enabled ? 'critical' : 'faded'));
-               }
-               return icon('fa-check ' + (enabled ? 'good' : 'faded'));
-           },
-           width: 70,
-       },
-       {
+           xtype: 'checkcolumn',
            header: gettext('Enabled'),
            dataIndex: 'Enabled',
-           renderer: Proxmox.Utils.format_enabled_toggle,
+           listeners: {
+               beforecheckchange: () => false, // veto, we don't want to allow inline change - to subtle
+           },
            width: 90,
        },
        {
@@ -165,16 +274,48 @@ Ext.define('Proxmox.node.APTRepositoriesGrid', {
        {
            header: gettext('Suites'),
            dataIndex: 'Suites',
-           renderer: function(suites, cell, record) {
-               return suites.join(' ');
+           renderer: function(suites, metaData, record) {
+               let err = '';
+               if (record.data.warnings && record.data.warnings.length > 0) {
+                   let txt = [gettext('Warning')];
+                   record.data.warnings.forEach((warning) => {
+                       if (warning.property === 'Suites') {
+                           txt.push(warning.message);
+                       }
+                   });
+                   metaData.tdAttr = `data-qtip="${Ext.htmlEncode(txt.join('<br>'))}"`;
+                   if (record.data.Enabled) {
+                       metaData.tdCls = 'proxmox-invalid-row';
+                       err = '<i class="fa fa-fw critical fa-exclamation-circle"></i> ';
+                   } else {
+                       metaData.tdCls = 'proxmox-warning-row';
+                       err = '<i class="fa fa-fw warning fa-exclamation-circle"></i> ';
+                   }
+               }
+               return suites.join(' ') + err;
            },
            width: 130,
        },
        {
            header: gettext('Components'),
            dataIndex: 'Components',
-           renderer: function(components, cell, record) {
-               return components.join(' ');
+           renderer: function(components, metaData, record) {
+               let err = '';
+               if (components.length === 1) {
+                   // FIXME: this should be a flag set to the actual repsotiories, i.e., a tristate
+                   // like production-ready = <yes|no|other> (Option<bool>)
+                   if (components[0].match(/\w+(-no-subscription|test)\s*$/i)) {
+                       metaData.tdCls = 'proxmox-warning-row';
+                       err = '<i class="fa fa-fw warning fa-exclamation-circle"></i> ';
+
+                       let qtip = components[0].match(/no-subscription/)
+                           ? gettext('The no-subscription repository is NOT production-ready')
+                           : gettext('The test repository may contain unstable updates')
+                           ;
+                           metaData.tdAttr = `data-qtip="${Ext.htmlEncode(qtip)}"`;
+                   }
+               }
+               return components.join(' ') + err;
            },
            width: 170,
        },
@@ -205,6 +346,23 @@ Ext.define('Proxmox.node.APTRepositoriesGrid', {
            },
            flex: 1,
        },
+       {
+           header: gettext('Origin'),
+           dataIndex: 'Origin',
+           width: 120,
+           renderer: (value, meta, rec) => {
+               if (typeof value !== 'string' || value.length === 0) {
+                   value = gettext('Other');
+               }
+               let cls = 'fa fa-fw fa-question-circle-o';
+               if (value.match(/^\s*Proxmox\s*$/i)) {
+                   cls = 'pmx-itype-icon pmx-itype-icon-proxmox-x';
+               } else if (value.match(/^\s*Debian\s*$/i)) {
+                   cls = 'pmx-itype-icon pmx-itype-icon-debian-swirl';
+               }
+               return `<i class='${cls}'></i> ${value}`;
+           },
+       },
        {
            header: gettext('Comment'),
            dataIndex: 'Comment',
@@ -212,53 +370,6 @@ Ext.define('Proxmox.node.APTRepositoriesGrid', {
        },
     ],
 
-    addAdditionalInfos: function(gridData, infos) {
-       let me = this;
-
-       let warnings = {};
-       let officialHosts = {};
-
-       let addLine = function(obj, key, line) {
-           if (obj[key]) {
-               obj[key] += "\n";
-               obj[key] += line;
-           } else {
-               obj[key] = line;
-           }
-       };
-
-       for (const info of infos) {
-           const key = `${info.path}:${info.index}`;
-           if (info.kind === 'warning' ||
-               (info.kind === 'ignore-pre-upgrade-warning' && !me.majorUpgradeAllowed)
-           ) {
-               addLine(warnings, key, gettext('Warning') + ": " + info.message);
-           } else if (info.kind === 'badge' && info.message === 'official host name') {
-               officialHosts[key] = true;
-           }
-       }
-
-       gridData.forEach(function(record) {
-           const key = `${record.Path}:${record.Index}`;
-           record.OfficialHost = !!officialHosts[key];
-       });
-
-       me.rowBodyFeature.getAdditionalData = function(innerData, rowIndex, record, orig) {
-           let headerCt = this.view.headerCt;
-           let colspan = headerCt.getColumnCount();
-
-           const key = `${innerData.Path}:${innerData.Index}`;
-           const warning_text = warnings[key];
-
-           return {
-               rowBody: '<div style="color: red; white-space: pre-line">' +
-                   Ext.String.htmlEncode(warning_text) + '</div>',
-               rowBodyCls: warning_text ? '' : Ext.baseCSSPrefix + 'grid-row-body-hidden',
-               rowBodyColspan: colspan,
-           };
-       };
-    },
-
     initComponent: function() {
        let me = this;
 
@@ -277,38 +388,19 @@ Ext.define('Proxmox.node.APTRepositoriesGrid', {
            ],
        });
 
-       let rowBodyFeature = Ext.create('Ext.grid.feature.RowBody', {});
-
        let groupingFeature = Ext.create('Ext.grid.feature.Grouping', {
            groupHeaderTpl: '{[ "File: " + values.name ]} ({rows.length} ' +
                'repositor{[values.rows.length > 1 ? "ies" : "y"]})',
            enableGroupingMenu: false,
        });
 
-       let sm = Ext.create('Ext.selection.RowModel', {});
-
        Ext.apply(me, {
            store: store,
-           selModel: sm,
-           rowBodyFeature: rowBodyFeature,
-           features: [groupingFeature, rowBodyFeature],
+           features: [groupingFeature],
        });
 
        me.callParent();
     },
-
-    listeners: {
-       selectionchange: function() {
-           let me = this;
-
-           if (me.onSelectionChange) {
-               let sm = me.getSelectionModel();
-               let rec = sm.getSelection()[0];
-
-               me.onSelectionChange(rec, sm);
-           }
-       },
-    },
 });
 
 Ext.define('Proxmox.node.APTRepositories', {
@@ -320,75 +412,172 @@ Ext.define('Proxmox.node.APTRepositories', {
 
     product: 'Proxmox VE', // default
 
+    controller: {
+       xclass: 'Ext.app.ViewController',
+
+       selectionChange: function(grid, selection) {
+           let me = this;
+           if (!selection || selection.length < 1) {
+               return;
+           }
+           let rec = selection[0];
+           let vm = me.getViewModel();
+           vm.set('selectionenabled', rec.get('Enabled'));
+           vm.notify();
+       },
+
+       updateState: function() {
+           let me = this;
+           let vm = me.getViewModel();
+
+           let store = vm.get('errorstore');
+           store.removeAll();
+
+           let status = 'good'; // start with best, the helper below will downgrade if needed
+           let text = gettext('All OK, you have production-ready repositories configured!');
+
+           let errors = vm.get('errors');
+           errors.forEach((error) => {
+               status = 'critical';
+               store.add({
+                   status: 'critical',
+                   message: `${error.path} - ${error.error}`,
+               });
+           });
+
+           let addGood = message => store.add({ status: 'good', message });
+
+           let addWarn = message => {
+               if (status === 'good') {
+                   status = 'warning';
+                   text = message;
+               }
+               store.add({ status: 'warning', message });
+           };
+
+           let activeSubscription = vm.get('subscriptionActive');
+           let enterprise = vm.get('enterpriseRepo');
+           let nosubscription = vm.get('noSubscriptionRepo');
+           let test = vm.get('testRepo');
+           let wrongSuites = vm.get('suitesWarning');
+
+           if (!enterprise && !nosubscription && !test) {
+               addWarn(Ext.String.format(gettext('No {0} repository is enabled!'), vm.get('product')));
+           } else if (enterprise && !nosubscription && !test && activeSubscription) {
+               addGood(Ext.String.format(gettext('You get supported updates for {0}'), vm.get('product')));
+           } else if (nosubscription || test) {
+               addGood(Ext.String.format(gettext('You get updates for {0}'), vm.get('product')));
+           }
+
+           if (wrongSuites) {
+               addWarn(gettext('Some Suites are misconfigured'));
+           }
+
+           if (!activeSubscription && enterprise) {
+               addWarn(gettext('The enterprise repository is enabled, but there is no active subscription!'));
+           }
+
+           if (nosubscription) {
+               addWarn(gettext('The no-subscription repository is not recommended for production use!'));
+           }
+
+           if (test) {
+               addWarn(gettext('The test repository is not recommended for production use!'));
+           }
+
+           if (errors.length > 0) {
+               text = gettext('Error parsing repositories');
+           }
+
+           let iconCls = Proxmox.Utils.get_health_icon(status, true);
+
+           vm.set('state', {
+               iconCls,
+               text,
+           });
+       },
+    },
+
     viewModel: {
        data: {
            product: 'Proxmox VE', // default
-           errorCount: 0,
+           errors: [],
+           suitesWarning: false,
            subscriptionActive: '',
            noSubscriptionRepo: '',
            enterpriseRepo: '',
+           testRepo: '',
+           selectionenabled: false,
+           state: {},
        },
        formulas: {
-           noErrors: (get) => get('errorCount') === 0,
-           mainWarning: function(get) {
-               // Not yet initialized
-               if (get('subscriptionActive') === '' ||
-                   get('enterpriseRepo') === '') {
-                   return '';
-               }
-
-               let icon = `<i class='fa fa-fw fa-exclamation-triangle critical'></i>`;
-               let fmt = (msg) => `<div class="black">${icon}${gettext('Warning')}: ${msg}</div>`;
-
-               if (!get('subscriptionActive') && get('enterpriseRepo')) {
-                   return fmt(gettext('The enterprise repository is enabled, but there is no active subscription!'));
-               }
-
-               if (get('noSubscriptionRepo')) {
-                   return fmt(gettext('The no-subscription repository is not recommended for production use!'));
-               }
-
-               if (!get('enterpriseRepo') && !get('noSubscriptionRepo')) {
-                   let msg = Ext.String.format(gettext('No {0} repository is enabled!'), get('product'));
-                   return fmt(msg);
-               }
-
-               return '';
+           enableButtonText: (get) => get('selectionenabled')
+               ? gettext('Disable') : gettext('Enable'),
+       },
+       stores: {
+           errorstore: {
+               fields: ['status', 'message'],
            },
        },
     },
 
+    scrollable: true,
+    layout: {
+       type: 'vbox',
+       align: 'stretch',
+    },
+
     items: [
        {
-           title: gettext('Warning'),
-           name: 'repositoriesMainWarning',
            xtype: 'panel',
-           bind: {
-               title: '{mainWarning}',
-               hidden: '{!mainWarning}',
-           },
-       },
-       {
-           xtype: 'proxmoxNodeAPTRepositoriesErrors',
-           name: 'repositoriesErrors',
-           hidden: true,
-           bind: {
-               hidden: '{noErrors}',
+           border: false,
+           layout: {
+               type: 'hbox',
+               align: 'stretch',
            },
+           height: 200,
+           title: gettext('Status'),
+           items: [
+               {
+                   xtype: 'box',
+                   flex: 2,
+                   margin: 10,
+                   data: {
+                       iconCls: Proxmox.Utils.get_health_icon(undefined, true),
+                       text: '',
+                   },
+                   bind: {
+                       data: '{state}',
+                   },
+                   tpl: [
+                       '<center class="centered-flex-column" style="font-size:15px;line-height: 25px;">',
+                       '<i class="fa fa-4x {iconCls}"></i>',
+                       '<br/><br/>',
+                       '{text}',
+                       '</center>',
+                   ],
+               },
+               {
+                   xtype: 'proxmoxNodeAPTRepositoriesErrors',
+                   name: 'repositoriesErrors',
+                   flex: 7,
+                   margin: 10,
+                   bind: {
+                       store: '{errorstore}',
+                   },
+               },
+           ],
        },
        {
            xtype: 'proxmoxNodeAPTRepositoriesGrid',
            name: 'repositoriesGrid',
+           flex: 1,
            cbind: {
                nodename: '{nodename}',
            },
            majorUpgradeAllowed: false, // TODO get release information from an API call?
-           onSelectionChange: function(rec, sm) {
-               let me = this;
-               if (rec) {
-                   let btn = me.up('proxmoxNodeAPTRepositories').down('#repoEnableButton');
-                   btn.setText(rec.get('Enabled') ? gettext('Disable') : gettext('Enable'));
-               }
+           listeners: {
+               selectionchange: 'selectionChange',
            },
        },
     ],
@@ -405,6 +594,7 @@ Ext.define('Proxmox.node.APTRepositories', {
                const res = response.result;
                const subscription = !(!res || !res.data || res.data.status.toLowerCase() !== 'active');
                vm.set('subscriptionActive', subscription);
+               me.getController().updateState();
            },
        });
     },
@@ -413,8 +603,8 @@ Ext.define('Proxmox.node.APTRepositories', {
        let me = this;
        let vm = me.getViewModel();
 
-       let menu = me.down('#addMenu');
-       menu.removeAll();
+       let addButton = me.down('#addButton');
+       addButton.repoInfo = [];
 
        for (const standardRepo of standardRepos) {
            const handle = standardRepo.handle;
@@ -424,59 +614,28 @@ Ext.define('Proxmox.node.APTRepositories', {
                vm.set('enterpriseRepo', status);
            } else if (handle === "no-subscription") {
                vm.set('noSubscriptionRepo', status);
+           } else if (handle === 'test') {
+               vm.set('testRepo', status);
            }
+           me.getController().updateState();
 
-           let status_text = '';
-           if (status !== undefined && status !== null) {
-               status_text = Ext.String.format(
-                   ' ({0}, {1})',
-                   gettext('configured'),
-                   status ? gettext('enabled') : gettext('disabled'),
-               );
-           }
-
-           menu.add({
-               text: standardRepo.name + status_text,
-               disabled: status !== undefined && status !== null,
-               repoHandle: handle,
-               handler: function(menuItem) {
-                   Proxmox.Utils.checked_command(() => {
-                       let params = {
-                           handle: menuItem.repoHandle,
-                       };
-
-                       if (me.digest !== undefined) {
-                           params.digest = me.digest;
-                       }
-
-                       Proxmox.Utils.API2Request({
-                           url: `/nodes/${me.nodename}/apt/repositories`,
-                           method: 'PUT',
-                           params: params,
-                           failure: function(response, opts) {
-                               Ext.Msg.alert(gettext('Error'), response.htmlStatus);
-                               me.reload();
-                           },
-                           success: function(response, opts) {
-                               me.reload();
-                           },
-                       });
-                   });
-               },
-           });
+           addButton.repoInfo.push(standardRepo);
+           addButton.digest = me.digest;
        }
+
+       addButton.setDisabled(false);
     },
 
     reload: function() {
        let me = this;
        let vm = me.getViewModel();
        let repoGrid = me.down('proxmoxNodeAPTRepositoriesGrid');
-       let errorGrid = me.down('proxmoxNodeAPTRepositoriesErrors');
 
        me.store.load(function(records, operation, success) {
            let gridData = [];
            let errors = [];
            let digest;
+           let suitesWarning = false;
 
            if (success && records.length > 0) {
                let data = records[0].data;
@@ -484,16 +643,49 @@ Ext.define('Proxmox.node.APTRepositories', {
                errors = data.errors;
                digest = data.digest;
 
+               let infos = {};
+               for (const info of data.infos) {
+                   let path = info.path;
+                   let idx = info.index;
+
+                   if (!infos[path]) {
+                       infos[path] = {};
+                   }
+                   if (!infos[path][idx]) {
+                       infos[path][idx] = {
+                           origin: '',
+                           warnings: [],
+                       };
+                   }
+
+                   if (info.kind === 'origin') {
+                       infos[path][idx].origin = info.message;
+                   } else if (info.kind === 'warning' ||
+                       (info.kind === 'ignore-pre-upgrade-warning' && !repoGrid.majorUpgradeAllowed)
+                   ) {
+                       infos[path][idx].warnings.push(info);
+                       if (!suitesWarning && info.property === 'Suites') {
+                           suitesWarning = true;
+                       }
+                   } else {
+                       throw 'unknown info';
+                   }
+               }
+
+
                files.forEach(function(file) {
                    for (let n = 0; n < file.repositories.length; n++) {
                        let repo = file.repositories[n];
                        repo.Path = file.path;
                        repo.Index = n;
+                       if (infos[file.path] && infos[file.path][n]) {
+                           repo.Origin = infos[file.path][n].origin || Proxmox.Utils.UnknownText;
+                           repo.warnings = infos[file.path][n].warnings || [];
+                       }
                        gridData.push(repo);
                    }
                });
 
-               repoGrid.addAdditionalInfos(gridData, data.infos);
                repoGrid.store.loadData(gridData);
 
                me.updateStandardRepos(data['standard-repos']);
@@ -501,8 +693,9 @@ Ext.define('Proxmox.node.APTRepositories', {
 
            me.digest = digest;
 
-           vm.set('errorCount', errors.length);
-           errorGrid.store.loadData(errors);
+           vm.set('errors', errors);
+           vm.set('suitesWarning', suitesWarning);
+           me.getController().updateState();
        });
 
        me.check_subscription();