From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <d.csapak@proxmox.com>
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) server-digest SHA256)
(No client certificate requested)
by lists.proxmox.com (Postfix) with ESMTPS id 8B546729EE
for <pve-devel@lists.proxmox.com>; Fri, 2 Jul 2021 16:27:47 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 732A1A587
for <pve-devel@lists.proxmox.com>; Fri, 2 Jul 2021 16:27:17 +0200 (CEST)
Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com
[94.136.29.106])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256)
(No client certificate requested)
by firstgate.proxmox.com (Proxmox) with ESMTPS id AC826A57D
for <pve-devel@lists.proxmox.com>; Fri, 2 Jul 2021 16:27:16 +0200 (CEST)
Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1])
by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 78EF5404E2
for <pve-devel@lists.proxmox.com>; Fri, 2 Jul 2021 16:27:16 +0200 (CEST)
From: Dominik Csapak <d.csapak@proxmox.com>
To: pve-devel@lists.proxmox.com
Date: Fri, 2 Jul 2021 16:27:15 +0200
Message-Id: <20210702142715.2064422-1-d.csapak@proxmox.com>
X-Mailer: git-send-email 2.30.2
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.685 Adjusted score from AWL reputation of From: address
BAYES_00 -1.9 Bayes spam probability is 0 to 1%
KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment
SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record
SPF_PASS -0.001 SPF: sender matches SPF record
Subject: [pve-devel] [PATCH widget-toolkit] node/APTRepositories: improve
error/warning display
X-BeenThere: pve-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/>
List-Post: <mailto:pve-devel@lists.proxmox.com>
List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=subscribe>
X-List-Received-Date: Fri, 02 Jul 2021 14:27:47 -0000
always show grid besides status, with the accumulated
stati/warnings/errors
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
we should take a deep look if the order of the messages are ok,
as well as which we should show as the 'overall' status
maybe only the overall status ? (ok/warning/error ?)
src/node/APTRepositories.js | 111 +++++++++++++++++++++++++-----------
1 file changed, 77 insertions(+), 34 deletions(-)
diff --git a/src/node/APTRepositories.js b/src/node/APTRepositories.js
index 43d6faf..eb22ba1 100644
--- a/src/node/APTRepositories.js
+++ b/src/node/APTRepositories.js
@@ -114,19 +114,25 @@ Ext.define('Proxmox.node.APTRepositoriesErrors', {
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,
},
],
@@ -424,16 +430,19 @@ Ext.define('Proxmox.node.APTRepositories', {
let me = this;
let vm = me.getViewModel();
- if (vm.get('errorCount') > 0) {
- vm.set('state', {
- iconCls: Proxmox.Utils.get_health_icon('critical', true),
- text: gettext('Error parsing repositories'),
+ let store = vm.get('errorstore');
+ store.removeAll();
+
+ let errors = vm.get('errors');
+ errors.forEach((error) => {
+ store.add({
+ status: 'critical',
+ message: `${error.path} - ${error.error}`,
});
- return;
- }
+ });
let text = gettext('Repositories are configured in a recommended way');
- let status = 'warning';
+ let status = 'good';
let activeSubscription = vm.get('subscriptionActive');
let enterprise = vm.get('enterpriseRepo');
@@ -441,18 +450,52 @@ Ext.define('Proxmox.node.APTRepositories', {
let test = vm.get('testRepo');
let wrongSuites = vm.get('suitesWarning');
+ let addGood = function(message) {
+ store.add({
+ status: 'good',
+ message,
+ });
+ };
+
+ let addWarn = function(message) {
+ status = 'warning';
+ text = message;
+ store.add({
+ status,
+ message,
+ });
+ };
+
+ 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) {
- text = gettext('The enterprise repository is enabled, but there is no active subscription!');
- } else if (nosubscription) {
- text = gettext('The no-subscription repository is not recommended for production use!');
- } else if (test) {
- text = gettext('The test repository is not recommended for production use!');
- } else if (!enterprise && !nosubscription && !test) {
- text = Ext.String.format(gettext('No {0} repository is enabled!'), vm.get('product'));
- } else if (wrongSuites) {
- text = gettext('Some Suites are misconfigured');
- } else {
- status = 'good';
+ 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) {
+ vm.set('state', {
+ iconCls: Proxmox.Utils.get_health_icon('critical', true),
+ text: gettext('Error parsing repositories'),
+ });
+ return;
}
let iconCls = Proxmox.Utils.get_health_icon(status, true);
@@ -467,7 +510,7 @@ Ext.define('Proxmox.node.APTRepositories', {
viewModel: {
data: {
product: 'Proxmox VE', // default
- errorCount: 0,
+ errors: [],
suitesWarning: false,
subscriptionActive: '',
noSubscriptionRepo: '',
@@ -477,10 +520,14 @@ Ext.define('Proxmox.node.APTRepositories', {
state: {},
},
formulas: {
- noErrors: (get) => get('errorCount') === 0,
enableButtonText: (get) => get('selectionenabled')
? gettext('Disable') : gettext('Enable'),
},
+ stores: {
+ errorstore: {
+ fields: ['status', 'message'],
+ },
+ },
},
scrollable: true,
@@ -497,7 +544,7 @@ Ext.define('Proxmox.node.APTRepositories', {
type: 'hbox',
align: 'stretch',
},
- height: 150,
+ height: 200,
title: gettext('Status'),
items: [
{
@@ -523,10 +570,9 @@ Ext.define('Proxmox.node.APTRepositories', {
xtype: 'proxmoxNodeAPTRepositoriesErrors',
name: 'repositoriesErrors',
flex: 2,
- hidden: true,
margin: 10,
bind: {
- hidden: '{noErrors}',
+ store: '{errorstore}',
},
},
],
@@ -593,7 +639,6 @@ Ext.define('Proxmox.node.APTRepositories', {
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 = [];
@@ -657,11 +702,9 @@ Ext.define('Proxmox.node.APTRepositories', {
me.digest = digest;
- vm.set('errorCount', errors.length);
+ vm.set('errors', errors);
vm.set('suitesWarning', suitesWarning);
me.getController().updateState();
-
- errorGrid.store.loadData(errors);
});
me.check_subscription();
--
2.30.2