From b1e93fb87457726560db69cfa6b0de7185573d1b Mon Sep 17 00:00:00 2001 From: Ivo Almeida Date: Mon, 8 Apr 2024 14:39:49 +0100 Subject: [PATCH] mgr/dashboard: fix snap schedule delete retention Fixes: https://tracker.ceph.com/issues/65370 Signed-off-by: Ivo Almeida (cherry picked from commit 985637825a48a678b0d88887c5e322de65599fc7) --- .../cephfs-snapshotschedule-list.component.ts | 3 +-- .../src/app/shared/api/cephfs-snapshot-schedule.service.ts | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-snapshotschedule-list/cephfs-snapshotschedule-list.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-snapshotschedule-list/cephfs-snapshotschedule-list.component.ts index 9a131a1e80b7c..53c8e924e82e7 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-snapshotschedule-list/cephfs-snapshotschedule-list.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-snapshotschedule-list/cephfs-snapshotschedule-list.component.ts @@ -300,8 +300,7 @@ export class CephfsSnapshotscheduleListComponent const interval = r.substring(0, r.length - 1); return `${interval}-${frequency}`; }) - ?.join('|') - ?.toLocaleLowerCase(); + ?.join('|'); this.modalRef = this.modalService.show(CriticalConfirmationModalComponent, { itemDescription: $localize`snapshot schedule`, diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/cephfs-snapshot-schedule.service.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/cephfs-snapshot-schedule.service.ts index ade935a9299a4..b06b9b51f9966 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/cephfs-snapshot-schedule.service.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/cephfs-snapshot-schedule.service.ts @@ -149,7 +149,7 @@ export class CephfsSnapshotScheduleService { retentionCopy: this.parseRetentionCopy(snapItem?.retention), retention: Object.values(snapItem?.retention || [])?.length ? Object.entries(snapItem.retention) - ?.map?.(([frequency, interval]) => `${interval}${frequency.toLocaleUpperCase()}`) + ?.map?.(([frequency, interval]) => `${interval}${frequency}`) .join(' ') : '-' })), -- 2.39.5