From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <pbs-devel-bounces@lists.proxmox.com>
Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68])
by lore.proxmox.com (Postfix) with ESMTPS id 24F031FF168
for <inbox@lore.proxmox.com>; Tue, 26 Nov 2024 15:48:08 +0100 (CET)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 1D6A84B63;
Tue, 26 Nov 2024 15:48:08 +0100 (CET)
From: Dominik Csapak <d.csapak@proxmox.com>
To: pbs-devel@lists.proxmox.com
Date: Tue, 26 Nov 2024 15:47:34 +0100
Message-Id: <20241126144734.2858189-1-d.csapak@proxmox.com>
X-Mailer: git-send-email 2.39.5
In-Reply-To: <20241125174012.678523-1-c.ebner@proxmox.com>
References: <20241125174012.678523-1-c.ebner@proxmox.com>
MIME-Version: 1.0
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.016 Adjusted score from AWL reputation of From: address
BAYES_00 -1.9 Bayes spam probability is 0 to 1%
DMARC_MISSING 0.1 Missing DMARC policy
KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment
RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to
Validity was blocked. See
https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more
information.
RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to
Validity was blocked. See
https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more
information.
RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to
Validity was blocked. See
https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more
information.
SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record
SPF_PASS -0.001 SPF: sender matches SPF record
URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See
http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more
information. [proxmox.com, sync.rs, jobs.rs]
Subject: [pbs-devel] [PATCH proxmox-backup] sync jobs: remove superfluous
direction property
X-BeenThere: pbs-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox Backup Server development discussion
<pbs-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pbs-devel>,
<mailto:pbs-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pbs-devel/>
List-Post: <mailto:pbs-devel@lists.proxmox.com>
List-Help: <mailto:pbs-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel>,
<mailto:pbs-devel-request@lists.proxmox.com?subject=subscribe>
Reply-To: Proxmox Backup Server development discussion
<pbs-devel@lists.proxmox.com>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: pbs-devel-bounces@lists.proxmox.com
Sender: "pbs-devel" <pbs-devel-bounces@lists.proxmox.com>
since the SyncJobConfig struct now contains a 'sync-direction' property, we can
omit the 'direction' property of the SyncJobStatus struct. This makes a
few adaptions in the ui necessary:
* use the correct field
* handle 'pull' as default (since we don't necessarily get a
'sync-direction' in that case)
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
based on:
https://lore.proxmox.com/pbs-devel/20241125174012.678523-1-c.ebner@proxmox.com/
and
https://lore.proxmox.com/pbs-devel/20241126092029.207319-1-f.gruenbichler@proxmox.com/
pbs-api-types/src/jobs.rs | 6 ------
src/api2/admin/sync.rs | 1 -
www/config/SyncView.js | 16 ++++++++--------
3 files changed, 8 insertions(+), 15 deletions(-)
diff --git a/pbs-api-types/src/jobs.rs b/pbs-api-types/src/jobs.rs
index 16b16dd84..04631d920 100644
--- a/pbs-api-types/src/jobs.rs
+++ b/pbs-api-types/src/jobs.rs
@@ -649,9 +649,6 @@ impl SyncJobConfig {
status: {
type: JobScheduleStatus,
},
- direction: {
- type: SyncDirection,
- },
},
)]
#[derive(Serialize, Deserialize, Clone, PartialEq)]
@@ -662,9 +659,6 @@ pub struct SyncJobStatus {
pub config: SyncJobConfig,
#[serde(flatten)]
pub status: JobScheduleStatus,
-
- /// The direction of the job
- pub direction: SyncDirection,
}
/// These are used separately without `ns`/`max-depth` sometimes in the API, specifically in the API
diff --git a/src/api2/admin/sync.rs b/src/api2/admin/sync.rs
index 089e6f50d..6722ebea0 100644
--- a/src/api2/admin/sync.rs
+++ b/src/api2/admin/sync.rs
@@ -120,7 +120,6 @@ pub fn list_config_sync_jobs(
list.push(SyncJobStatus {
config: job,
status,
- direction,
});
}
diff --git a/www/config/SyncView.js b/www/config/SyncView.js
index ca1f7ecd6..503bdc6df 100644
--- a/www/config/SyncView.js
+++ b/www/config/SyncView.js
@@ -45,7 +45,7 @@ Ext.define('PBS.config.SyncJobView', {
store.clearFilter();
- let fieldsToSearch = ['direction', 'id', 'remote', 'remote-store', 'owner'];
+ let fieldsToSearch = ['sync-direction', 'id', 'remote', 'remote-store', 'owner'];
if (!view.datastore) {
fieldsToSearch.push('store');
}
@@ -96,7 +96,7 @@ Ext.define('PBS.config.SyncJobView', {
Ext.create('PBS.window.SyncJobEdit', {
datastore: view.datastore,
id: selection[0].data.id,
- syncDirection: selection[0].data.direction,
+ syncDirection: selection[0].data['sync-direction'],
listeners: {
destroy: function() {
me.reload();
@@ -174,7 +174,7 @@ Ext.define('PBS.config.SyncJobView', {
type: 'diff',
autoDestroy: true,
autoDestroyRstore: true,
- sorters: ['store', 'direction', 'id'],
+ sorters: ['store', 'sync-direction', 'id'],
rstore: {
type: 'update',
storeid: 'pbs-sync-jobs-status',
@@ -277,15 +277,15 @@ Ext.define('PBS.config.SyncJobView', {
},
{
header: gettext('Direction'),
- dataIndex: 'direction',
+ dataIndex: 'sync-direction',
renderer: function(value) {
let iconCls, text;
- if (value === 'pull') {
- iconCls = 'download';
- text = gettext('Pull');
- } else {
+ if (value === 'push') {
iconCls = 'upload';
text = gettext('Push');
+ } else {
+ iconCls = 'download';
+ text = gettext('Pull');
}
return `<i class="fa fa-fw fa-${iconCls}"></i> ${text}`;
},
--
2.39.5
_______________________________________________
pbs-devel mailing list
pbs-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel