Fix [Project Settings, Projects] The second 'confirm message' is miss…

…ing when deleting a non-empty project (#3005)
mlrun · Jan 13, 2025 · 19c61a8 · 19c61a8
1 parent 3b5f4a5
commit 19c61a8
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 13 deletions.
diff --git a/src/api/projects-api.js b/src/api/projects-api.js
@@ -26,14 +26,11 @@ const projectsApi = {
     }),
   createProject: postData => mainHttpClient.post('/projects', postData),
   deleteProject: (project, deleteNonEmpty) =>
-    mainHttpClientV2.delete(
-      `/projects/${project}`,
-      deleteNonEmpty && {
-        headers: {
-          'x-mlrun-deletion-strategy': 'cascade'
-        }
+    mainHttpClientV2.delete(`/projects/${project}`, {
+      headers: {
+        'x-mlrun-deletion-strategy': deleteNonEmpty ? 'cascade' : 'restricted'
       }
-    ),
+    }),
   deleteSecret: (project, key) =>
     mainHttpClient.delete(`/projects/${project}/secrets?provider=kubernetes&secret=${key}`),
   editProject: (project, data) => mainHttpClient.put(`/projects/${project}`, data),
@@ -84,7 +81,7 @@ const projectsApi = {
       signal
     }),
   getProjectSummary: (project, signal) => {
-    return mainHttpClient.get(`/project-summaries/${project}`, {signal})
+    return mainHttpClient.get(`/project-summaries/${project}`, { signal })
   },
   getProjectWorkflows: project => {
     return mainHttpClient.get(`/projects/${project}/pipelines`)

diff --git a/src/components/ProjectSettings/ProjectSettings.js b/src/components/ProjectSettings/ProjectSettings.js
@@ -284,7 +284,7 @@ const ProjectSettings = () => {
         />
       )}
 
-      { projectStore.projectsToDelete.includes(params.projectName) && <Loader />}
+      {projectStore.projectsToDelete.includes(params.projectName) && <Loader />}
 
       <div className="settings">
         <div className="settings__header">

diff --git a/src/components/ProjectsPage/ProjectsView.js b/src/components/ProjectsPage/ProjectsView.js
@@ -97,7 +97,7 @@ const ProjectsView = ({
           }}
           closePopUp={confirmData.rejectHandler}
           confirmButton={{
-            handler: () => confirmData.confirmHandler(confirmData.item),
+            handler: confirmData.confirmHandler,
             label: confirmData.btnConfirmLabel,
             variant: confirmData.btnConfirmType
           }}

diff --git a/src/components/ProjectsPage/projects.util.js b/src/components/ProjectsPage/projects.util.js
@@ -161,7 +161,7 @@ export const handleDeleteProjectError = (
       rejectHandler: () => {
         setConfirmData(null)
       },
-      confirmHandler: project => {
+      confirmHandler: () => {
         handleDeleteProject(
           project,
           true,
@@ -336,8 +336,7 @@ export const onDeleteProject = (project, setConfirmData, ...args) => {
     rejectHandler: () => {
       setConfirmData(null)
     },
-    confirmHandler: deleteNonEmpty =>
-      handleDeleteProject(project, deleteNonEmpty, setConfirmData, ...args)
+    confirmHandler: () => handleDeleteProject(project, false, setConfirmData, ...args)
   })
 }