From: Ivo Almeida <ialmeida@redhat.com>
Date: Mon, 8 Apr 2024 13:39:49 +0000 (+0100)
Subject: mgr/dashboard: fix snap schedule delete retention
X-Git-Tag: testing/wip-yuriw-testing-20240416.150233~12^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=b1e93fb87457726560db69cfa6b0de7185573d1b;p=ceph-ci.git

mgr/dashboard: fix snap schedule delete retention

Fixes: https://tracker.ceph.com/issues/65370

Signed-off-by: Ivo Almeida <ialmeida@redhat.com>
(cherry picked from commit 985637825a48a678b0d88887c5e322de65599fc7)
---

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 9a131a1e80b..53c8e924e82 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 ade935a9299..b06b9b51f99 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(' ')
               : '-'
           })),