From aaddf46a635c222999fea9950b1f6c7ea431ad96 Mon Sep 17 00:00:00 2001 From: Daniel Tschlatscher Date: Wed, 9 Nov 2022 15:25:24 +0100 Subject: [PATCH] gui: change reporting of the estimated_time_full to "Full" if no space is left in the datastore. Before, the GUI would report "Never" for the estimated time full, because the value provided in the backend was in the past. To get around this, the GUI now reports "Full" if the value for available reaches 0. Signed-off-by: Daniel Tschlatscher --- www/Utils.js | 6 +++++- www/datastore/DataStoreListSummary.js | 3 ++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/www/Utils.js b/www/Utils.js index ad451c9f..f6d353ef 100644 --- a/www/Utils.js +++ b/www/Utils.js @@ -285,7 +285,11 @@ Ext.define('PBS.Utils', { return tokenid.match(/^(.+)!([^!]+)$/)[2]; }, - render_estimate: function(value) { + render_estimate: function(value, metaData, record) { + if (record.data.avail === 0) { + return gettext("Full"); + } + if (value === undefined) { return gettext('Not enough data'); } diff --git a/www/datastore/DataStoreListSummary.js b/www/datastore/DataStoreListSummary.js index bec0562d..968239b0 100644 --- a/www/datastore/DataStoreListSummary.js +++ b/www/datastore/DataStoreListSummary.js @@ -62,7 +62,8 @@ Ext.define('PBS.datastore.DataStoreListSummary', { let usagePanel = me.lookup('usage'); usagePanel.updateValue(usage, usagetext); - let estimate = PBS.Utils.render_estimate(statusData['estimated-full-date']); + let estimate = PBS.Utils.render_estimate(statusData['estimated-full-date'], null, { data: statusData }); + vm.set('full', estimate); vm.set('deduplication', PBS.Utils.calculate_dedup_factor(statusData['gc-status']).toFixed(2)); vm.set('stillbad', statusData['gc-status']['still-bad']);