From d823da3e6490ae67f57b70b08b23d515b8caeef9 Mon Sep 17 00:00:00 2001
From: Badlybear <alonfriedman7@gmail.com>
Date: Wed, 4 Jun 2025 16:27:26 +0300
Subject: [PATCH] fix restore label naming

---
 openshift-guardian-ui/src/pages/Restores/CreateRestore.js   | 3 ++-
 openshift-guardian-ui/src/pages/Restores/ViewRestores.js    | 4 ++--
 openshift-guardian2/API/oadp-api.py                         | 6 ++++--
 .../openshift-guardian/src/pages/Restores/CreateRestore.jsx | 3 ++-
 .../openshift-guardian/src/pages/Restores/ViewRestores.jsx  | 4 ++--
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/openshift-guardian-ui/src/pages/Restores/CreateRestore.js b/openshift-guardian-ui/src/pages/Restores/CreateRestore.js
index 2453ff1..3f705f6 100644
--- a/openshift-guardian-ui/src/pages/Restores/CreateRestore.js
+++ b/openshift-guardian-ui/src/pages/Restores/CreateRestore.js
@@ -122,7 +122,8 @@ const CreateRestore = ({ darkMode }) => {
           namespaces: selectedNamespace,
           backup_name: selectedBackup,
           included_resources: selectedResources,
-          match_lables: matchLabelsObj,
+          // send match label selectors
+          match_labels: matchLabelsObj,
         }),
       });
       if (!response.ok) throw new Error('Failed to create restore');
diff --git a/openshift-guardian-ui/src/pages/Restores/ViewRestores.js b/openshift-guardian-ui/src/pages/Restores/ViewRestores.js
index fb0fa60..f3edc7b 100644
--- a/openshift-guardian-ui/src/pages/Restores/ViewRestores.js
+++ b/openshift-guardian-ui/src/pages/Restores/ViewRestores.js
@@ -143,8 +143,8 @@ const ViewRestores = ({ darkMode }) => {
                         <br />
                         <strong>Match Labels:</strong>
                         <ul>
-                          {restore.match_lables ? (
-                            Object.entries(restore.match_lables).map(([key, value]) => (
+                          {restore.match_labels ? (
+                            Object.entries(restore.match_labels).map(([key, value]) => (
                               <li key={key}>{key}: {value}</li>
                             ))
                           ) : (
diff --git a/openshift-guardian2/API/oadp-api.py b/openshift-guardian2/API/oadp-api.py
index ed86919..232721d 100644
--- a/openshift-guardian2/API/oadp-api.py
+++ b/openshift-guardian2/API/oadp-api.py
@@ -161,9 +161,11 @@ async def create_restore(request: Request, user: dict = Depends(get_current_user
         "Time Created": "2025-03-13T",
         "status": "Completed",
         "namespace": params["namespaces"],
-        "backup_name": f"{params['namespaces']}-restore",
+        # Track which backup this restore references
+        "backup_name": params.get("backup_name"),
         "included_resources": params["included_resources"],
-        "match_labels": params["match_lables"],
+        # Accept match_labels from request payload
+        "match_labels": params.get("match_labels", {}),
     }
     restores["restores"].append(restore)
     return {"message": "Created restore successfully"}
diff --git a/openshift-guardian2/openshift-guardian/src/pages/Restores/CreateRestore.jsx b/openshift-guardian2/openshift-guardian/src/pages/Restores/CreateRestore.jsx
index 175f9f4..bb10a92 100644
--- a/openshift-guardian2/openshift-guardian/src/pages/Restores/CreateRestore.jsx
+++ b/openshift-guardian2/openshift-guardian/src/pages/Restores/CreateRestore.jsx
@@ -154,7 +154,8 @@ const CreateRestore = ({ darkMode }) => {
           namespaces: selectedNamespace,
           backup_name: selectedBackup,
           included_resources: selectedResources,
-          match_lables: matchLabelsObj,
+          // send match label selectors
+          match_labels: matchLabelsObj,
         }),
       });
       if (!response.ok) throw new Error('Failed to create restore');
diff --git a/openshift-guardian2/openshift-guardian/src/pages/Restores/ViewRestores.jsx b/openshift-guardian2/openshift-guardian/src/pages/Restores/ViewRestores.jsx
index 29e0ac3..14b1f81 100644
--- a/openshift-guardian2/openshift-guardian/src/pages/Restores/ViewRestores.jsx
+++ b/openshift-guardian2/openshift-guardian/src/pages/Restores/ViewRestores.jsx
@@ -151,8 +151,8 @@ const ViewRestores = ({ darkMode }) => {
                         <br />
                         <strong>Match Labels:</strong>
                         <ul>
-                          {restore.match_lables ? (
-                            Object.entries(restore.match_lables).map(([key, value]) => (
+                          {restore.match_labels ? (
+                            Object.entries(restore.match_labels).map(([key, value]) => (
                               <li key={key}>{key}: {value}</li>
                             ))
                           ) : (