From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 041766937E for ; Mon, 22 Mar 2021 13:00:31 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 59831232C4 for ; Mon, 22 Mar 2021 13:00:00 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 15B732323B for ; Mon, 22 Mar 2021 12:59:57 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id D3C1745936 for ; Mon, 22 Mar 2021 12:59:56 +0100 (CET) From: Fabian Ebner To: pbs-devel@lists.proxmox.com Date: Mon, 22 Mar 2021 12:59:45 +0100 Message-Id: <20210322115945.1362-11-f.ebner@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210322115945.1362-1-f.ebner@proxmox.com> References: <20210322115945.1362-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.004 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pbs-devel] [PATCH v3 widget-toolkit 10/10] APT repositories: add warnings X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Mar 2021 12:00:31 -0000 Signed-off-by: Fabian Ebner --- Changes from v2: * rename globalWarning to mainWarning * use gettext for main warnings * use a stand-alone label component for the main warning instead of misusing the title bar. This made it necessary to adapt the view model and the reload functionionality, including handling of the rowBodyFeature. * reduce capslock, since the warning is clearly visible even without. src/node/APTRepositories.js | 172 +++++++++++++++++++++++++++++++++--- 1 file changed, 161 insertions(+), 11 deletions(-) diff --git a/src/node/APTRepositories.js b/src/node/APTRepositories.js index 0b21a8a..d9b70be 100644 --- a/src/node/APTRepositories.js +++ b/src/node/APTRepositories.js @@ -14,13 +14,15 @@ Ext.define('apt-repolist', { ], }); -Ext.define('Proxmox.node.APTRepositories', { +Ext.define('Proxmox.node.APTRepositoriesGrid', { extend: 'Ext.grid.GridPanel', - xtype: 'proxmoxNodeAPTRepositories', + xtype: 'proxmoxNodeAPTRepositoriesGrid', sortableColumns: false, + rowBodyFeature: undefined, + columns: [ { header: gettext('Enabled'), @@ -94,6 +96,78 @@ Ext.define('Proxmox.node.APTRepositories', { }, ], + check_repositories: function() { + let me = this; + let vm = me.up('proxmoxNodeAPTRepositories').getViewModel(); + + Proxmox.Utils.API2Request({ + url: `/nodes/${me.nodename}/apt/checkrepositories`, + method: 'GET', + failure: function(response, opts) { + Ext.Msg.alert(gettext('Error'), response.htmlStatus); + }, + success: function(response, opts) { + const data = response.result.data; + + vm.set('enterpriseRepo', data.enterprise); + vm.set('noSubscriptionRepo', data.nosubscription); + + let warnings = {}; + for (const warning of data.warnings) { + const key = `${warning.Path}:${warning.Number}`; + if (warnings[key]) { + warnings[key] += "\n"; + warnings[key] += "Warning: " + warning.Warning; + } else { + warnings[key] = "Warning: " + warning.Warning; + } + } + + me.rowBodyFeature.getAdditionalData = function(innerData, rowIndex, record, orig) { + let headerCt = this.view.headerCt; + let colspan = headerCt.getColumnCount(); + + const key = `${innerData.Path}:${innerData.Number}`; + const warning_text = warnings[key]; + + return { + rowBody: '
' + + Ext.String.htmlEncode(warning_text) + + '
', + rowBodyCls: warning_text ? '' : Ext.baseCSSPrefix + 'grid-row-body-hidden', + rowBodyColspan: colspan, + }; + }; + }, + }); + }, + + check_subscription: function() { + let me = this; + let vm = me.up('proxmoxNodeAPTRepositories').getViewModel(); + + Proxmox.Utils.API2Request({ + url: `/nodes/${me.nodename}/subscription`, + method: 'GET', + failure: function(response, opts) { + Ext.Msg.alert(gettext('Error'), response.htmlStatus); + }, + success: function(response, opts) { + const res = response.result; + const subscription = !(res === null || res === undefined || + !res || res.data.status.toLowerCase() !== 'active'); + vm.set('subscriptionActive', subscription); + }, + }); + }, + + reload: function() { + let me = this; + me.store.load(); + me.check_repositories(); + me.check_subscription(); + }, + initComponent: function() { let me = this; @@ -116,29 +190,105 @@ Ext.define('Proxmox.node.APTRepositories', { ], }); + let rowBodyFeature = Ext.create('Ext.grid.feature.RowBody', {}); + me.rowBodyFeature = rowBodyFeature; + let groupingFeature = Ext.create('Ext.grid.feature.Grouping', { groupHeaderTpl: '{[ "File: " + values.name ]} ({rows.length} ' + 'repositor{[values.rows.length > 1 ? "ies" : "y"]})', enableGroupingMenu: false, }); - let reload = function() { - store.load(); - }; - let sm = Ext.create('Ext.selection.RowModel', {}); Ext.apply(me, { store: store, selModel: sm, - features: [groupingFeature], - listeners: { - activate: reload, - }, + features: [groupingFeature, me.rowBodyFeature], }); Proxmox.Utils.monStoreErrors(me, store, true); - reload(); + me.reload(); + + me.callParent(); + }, +}); + +Ext.define('Proxmox.node.APTRepositories', { + extend: 'Ext.panel.Panel', + + xtype: 'proxmoxNodeAPTRepositories', + mixins: ['Proxmox.Mixin.CBind'], + + viewModel: { + data: { + subscriptionActive: '', + noSubscriptionRepo: '', + enterpriseRepo: '', + }, + formulas: { + mainWarning: function(get) { + if (get('subscriptionActive') === '' || + get('noSubscriptionRepo') === '' || + get('enterpriseRepo') === '') { + return ''; + } + + const warn = gettext('Warning') + ': '; + + if (!get('subscriptionActive') && get('enterpriseRepo')) { + return warn + gettext('The enterprise repository is ' + + 'configured, but there is no active subscription!'); + } + + if (get('noSubscriptionRepo')) { + return warn + gettext('The no-subscription repository is ' + + 'not recommended for production use!'); + } + + if (!get('enterpriseRepo') && !get('noSubscriptionRepo')) { + return warn + gettext('Neither the enterprise repository ' + + 'nor the no-subscription repository is configured!'); + } + + return ''; + }, + }, + }, + + items: [ + { + xtype: 'label', + name: 'mainWarning', + cls: 'fa fa-exclamation-triangle', + style: 'color:red;', + bind: { + text: '{mainWarning}', + hidden: '{!mainWarning}', + }, + }, + { + xtype: 'proxmoxNodeAPTRepositoriesGrid', + name: 'repoGrid', + cbind: { + nodename: '{nodename}', + }, + }, + ], + + listeners: { + activate: function() { + let me = this; + me.down('proxmoxNodeAPTRepositoriesGrid').reload(); + }, + }, + + initComponent: function() { + let me = this; + + if (!me.nodename) { + throw "no node name specified"; + } me.callParent(); }, -- 2.20.1