From: Fabian Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH manager] ui: node status: use repo status widget from widget-toolkit
Date: Thu, 22 Jul 2021 15:30:00 +0200 [thread overview]
Message-ID: <20210722133000.2308803-1-f.ebner@proxmox.com> (raw)
Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
---
Depends on
https://lists.proxmox.com/pipermail/pbs-devel/2021-July/003764.html
and needs a dependency bump for it.
www/manager6/node/StatusView.js | 95 ++++++---------------------------
www/manager6/node/Summary.js | 6 +--
2 files changed, 18 insertions(+), 83 deletions(-)
diff --git a/www/manager6/node/StatusView.js b/www/manager6/node/StatusView.js
index d7a08529..d34724f7 100644
--- a/www/manager6/node/StatusView.js
+++ b/www/manager6/node/StatusView.js
@@ -2,55 +2,6 @@ Ext.define('PVE.node.StatusView', {
extend: 'Proxmox.panel.StatusView',
alias: 'widget.pveNodeStatus',
- 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 fmt = (txt, cls) => `<i class="fa fa-fw fa-lg fa-${cls}"></i>${txt}`;
-
- let getUpdates = Ext.String.format(gettext('{0} updates'), 'Proxmox VE');
-
- if (status === 'ok') {
- return fmt(getUpdates, 'check-circle good') + ' ' +
- fmt(gettext('Production-ready Enterprise repository enabled'), 'check-circle good');
- } else if (status === 'no-sub') {
- return fmt(gettext('Production-ready Enterprise repository enabled'), 'check-circle good') + ' ' +
- fmt(gettext('Enterprise repository needs valid subscription'), 'exclamation-circle warning');
- } else if (status === 'non-production') {
- return fmt(getUpdates, 'check-circle good') + ' ' +
- fmt(gettext('Non production-ready repository enabled!'), 'exclamation-circle warning');
- } else if (status === 'no-repo') {
- return fmt(gettext('No Proxmox VE repository enabled!'), 'exclamation-circle critical');
- }
-
- return Proxmox.Utils.unknownText;
- },
- },
- },
-
height: 300,
bodyPadding: '15 5 15 5',
@@ -162,18 +113,6 @@ Ext.define('PVE.node.StatusView', {
textField: 'pveversion',
value: '',
},
- {
- itemId: 'repositoryStatus',
- colspan: 2,
- printBar: false,
- title: gettext('Repository Status'),
- setValue: function(value) { // for binding below
- this.updateValue(value);
- },
- bind: {
- value: '{repoStatusMessage}',
- },
- },
],
updateTitle: function() {
@@ -182,28 +121,24 @@ Ext.define('PVE.node.StatusView', {
me.setTitle(me.pveSelNode.data.node + ' (' + gettext('Uptime') + ': ' + uptime + ')');
},
- setRepositoryInfo: function(standardRepos) {
+ initComponent: function() {
let me = this;
- let vm = me.getViewModel();
-
- for (const standardRepo of standardRepos) {
- const handle = standardRepo.handle;
- const status = standardRepo.status;
- if (handle === "enterprise") {
- vm.set('enterpriseRepo', status);
- } else if (handle === "no-subscription") {
- vm.set('noSubscriptionRepo', status);
- } else if (handle === "test") {
- vm.set('testRepo', status);
- }
- }
- },
+ let stateProvider = Ext.state.Manager.getProvider();
+ let repoLink = stateProvider.encodeHToken({
+ view: "server",
+ rid: `node/${me.pveSelNode.data.node}`,
+ ltab: "tasks",
+ nodetab: "aptrepositories",
+ });
- setSubscriptionStatus: function(status) {
- let me = this;
- let vm = me.getViewModel();
+ me.items.push({
+ xtype: 'pmxNodeInfoRepoStatus',
+ itemId: 'repositoryStatus',
+ product: 'Proxmox VE',
+ repoLink: `#${repoLink}`,
+ });
- vm.set('subscriptionActive', status);
+ me.callParent();
},
});
diff --git a/www/manager6/node/Summary.js b/www/manager6/node/Summary.js
index ecc62de8..8680fa5f 100644
--- a/www/manager6/node/Summary.js
+++ b/www/manager6/node/Summary.js
@@ -85,7 +85,7 @@ Ext.define('PVE.node.Summary', {
updateRepositoryStatus: function() {
let me = this;
- let nodeStatus = me.nodeStatus;
+ let repoStatus = me.nodeStatus.down('#repositoryStatus');
let nodename = me.pveSelNode.data.node;
@@ -93,7 +93,7 @@ Ext.define('PVE.node.Summary', {
url: `/nodes/${nodename}/apt/repositories`,
method: 'GET',
failure: response => Ext.Msg.alert(gettext('Error'), response.htmlStatus),
- success: response => nodeStatus.setRepositoryInfo(response.result.data['standard-repos']),
+ success: response => repoStatus.setRepositoryInfo(response.result.data['standard-repos']),
});
Proxmox.Utils.API2Request({
@@ -103,7 +103,7 @@ Ext.define('PVE.node.Summary', {
success: function(response, opts) {
const res = response.result;
const subscription = res?.data?.status.toLowerCase() === 'active';
- nodeStatus.setSubscriptionStatus(subscription);
+ repoStatus.setSubscriptionStatus(subscription);
},
});
},
--
2.30.2
reply other threads:[~2021-07-22 13:30 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210722133000.2308803-1-f.ebner@proxmox.com \
--to=f.ebner@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal