From: Lukas Wagner <l.wagner@proxmox.com>
To: Proxmox Backup Server development discussion
<pbs-devel@lists.proxmox.com>,
Hannes Laimer <h.laimer@proxmox.com>
Subject: Re: [pbs-devel] [PATCH proxmox-backup 17/23] ui: add datastore status mask for unplugged removable datastores
Date: Tue, 19 Sep 2023 15:38:46 +0200 [thread overview]
Message-ID: <32298ed3-1dc7-4e6f-9797-218c12355633@proxmox.com> (raw)
In-Reply-To: <20230915065457.352953-18-h.laimer@proxmox.com>
On 9/15/23 08:54, Hannes Laimer wrote:
> diff --git a/www/datastore/Summary.js b/www/datastore/Summary.js
> index dfff6e7f..d80c4a08 100644
> --- a/www/datastore/Summary.js
> +++ b/www/datastore/Summary.js
> @@ -61,16 +61,20 @@ Ext.define('PBS.DataStoreInfo', {
> Proxmox.Utils.API2Request({
> url: `/config/datastore/${me.view.datastore}`,
> success: function(response) {
> - const config = response.result.data;
> - if (config['maintenance-mode']) {
> - const [_type, msg] = PBS.Utils.parseMaintenanceMode(config['maintenance-mode']);
> - me.view.el.mask(
> - `${gettext('Datastore is in maintenance mode')}${msg ? ': ' + msg : ''}`,
> - 'fa pbs-maintenance-mask',
> - );
> - } else {
> + const maintenanceString = response.result.data['maintenance-mode'];
> + if (!maintenanceString) {
> me.view.el.mask(gettext('Datastore is not available'));
> + return;
> }
> +
> + const [type, msg] = PBS.Utils.parseMaintenanceMode(maintenanceString);
> + const isUnplugged = type === 'unplugged';
> + const maskMessage = isUnplugged
> + ? gettext('Datastore is unplugged')
> + : `${gettext('Datastore is in maintenance mode')}${msg ? ': ' + msg : ''}`;
I know this expression existed before, but maybe use the opportunity to
make it a bit more readable? It's a bit hard to parse for my brain :)
--
- Lukas
next prev parent reply other threads:[~2023-09-19 13:38 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-15 6:54 [pbs-devel] [PATCH proxmox-backup 00/23] add " Hannes Laimer
2023-09-15 6:54 ` [pbs-devel] [PATCH proxmox-backup 01/23] tools: add disks utility functions Hannes Laimer
2023-09-19 13:37 ` Lukas Wagner
2023-09-15 6:54 ` [pbs-devel] [PATCH proxmox-backup 02/23] pbs-api-types: add backing-device to DataStoreConfig Hannes Laimer
2023-09-19 13:37 ` Lukas Wagner
2023-09-15 6:54 ` [pbs-devel] [PATCH proxmox-backup 03/23] maintenance: add 'Unpplugged' maintenance type Hannes Laimer
2023-09-19 13:37 ` Lukas Wagner
2023-09-21 7:41 ` Hannes Laimer
2023-09-21 8:16 ` Lukas Wagner
2023-09-15 6:54 ` [pbs-devel] [PATCH proxmox-backup 04/23] disks: add UUID to partition info Hannes Laimer
2023-09-15 6:54 ` [pbs-devel] [PATCH proxmox-backup 05/23] api2: admin: add (un)mount endpoint for removable datastores Hannes Laimer
2023-09-19 13:38 ` Lukas Wagner
2023-09-21 7:50 ` Hannes Laimer
2023-09-21 8:37 ` Lukas Wagner
2023-09-21 8:41 ` Hannes Laimer
2023-09-15 6:54 ` [pbs-devel] [PATCH proxmox-backup 06/23] add helper for checking if a removable datastore is available Hannes Laimer
2023-09-19 13:38 ` Lukas Wagner
2023-09-15 6:54 ` [pbs-devel] [PATCH proxmox-backup 07/23] api2: removable datastore creation Hannes Laimer
2023-09-19 13:38 ` Lukas Wagner
2023-09-15 6:54 ` [pbs-devel] [PATCH proxmox-backup 08/23] ui: add partition selector form Hannes Laimer
2023-09-15 6:54 ` [pbs-devel] [PATCH proxmox-backup 09/23] api2: disks list: add only-unused flag Hannes Laimer
2023-09-15 6:54 ` [pbs-devel] [PATCH proxmox-backup 10/23] ui: add removable datastore creation support Hannes Laimer
2023-09-19 13:38 ` Lukas Wagner
2023-09-15 6:54 ` [pbs-devel] [PATCH proxmox-backup 11/23] ui: add (un)mount button to summary Hannes Laimer
2023-09-19 13:38 ` Lukas Wagner
2023-09-15 6:54 ` [pbs-devel] [PATCH proxmox-backup 12/23] pbs-api-types: datastore: use new proxmox_scheme::de for deserialization Hannes Laimer
2023-09-15 6:54 ` [pbs-devel] [PATCH proxmox-backup 13/23] pbs-api-types: add removable/is-available flag to DataStoreListItem Hannes Laimer
2023-09-15 6:54 ` [pbs-devel] [PATCH proxmox-backup 14/23] ui: display removable datastores in list Hannes Laimer
2023-09-15 6:54 ` [pbs-devel] [PATCH proxmox-backup 15/23] ui: utils: render unplugged maintenance mode correctly Hannes Laimer
2023-09-15 6:54 ` [pbs-devel] [PATCH proxmox-backup 16/23] ui: utils: make parseMaintenanceMode more robust Hannes Laimer
2023-09-19 13:38 ` Lukas Wagner
2023-09-15 6:54 ` [pbs-devel] [PATCH proxmox-backup 17/23] ui: add datastore status mask for unplugged removable datastores Hannes Laimer
2023-09-19 13:38 ` Lukas Wagner [this message]
2023-09-15 6:54 ` [pbs-devel] [PATCH proxmox-backup 18/23] ui: maintenance: fix disable msg field if no type is selected Hannes Laimer
2023-09-15 6:54 ` [pbs-devel] [PATCH proxmox-backup 19/23] ui: maintenance: disable edit if unplugged Hannes Laimer
2023-09-15 6:54 ` [pbs-devel] [PATCH proxmox-backup 20/23] pb-manager: add (un)mount command Hannes Laimer
2023-09-19 13:38 ` Lukas Wagner
2023-09-15 6:54 ` [pbs-devel] [PATCH proxmox-backup 21/23] add auto-mounting for removable datastores Hannes Laimer
2023-09-15 6:54 ` [pbs-devel] [PATCH proxmox-backup 22/23] api: mark removable datastores as unplugged after restart Hannes Laimer
2023-09-15 6:54 ` [pbs-devel] [PATCH proxmox-backup 23/23] datastore: handle deletion of removable datastore properly Hannes Laimer
2023-09-19 13:37 ` [pbs-devel] [PATCH proxmox-backup 00/23] add removable datastores Lukas Wagner
2023-09-19 15:01 ` Thomas Lamprecht
2023-09-19 15:08 ` Lukas Wagner
2023-09-20 10:22 ` Lukas Wagner
2023-09-19 14:03 ` Lukas Wagner
2023-09-19 15:10 ` Lukas Wagner
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=32298ed3-1dc7-4e6f-9797-218c12355633@proxmox.com \
--to=l.wagner@proxmox.com \
--cc=h.laimer@proxmox.com \
--cc=pbs-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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox