[master] fix: Fix delete workspace with deleting project on workspace…

… baseinfo page (#4389) fix: Fix delete workspace with deleting project on workspace baseinfo page Signed-off-by: lannyfu <[email protected]> Co-authored-by: lannyfu <[email protected]>
kubesphere · Dec 24, 2024 · 8d9d2eb · 8d9d2eb
1 parent 09bd2b9
commit 8d9d2eb
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 15 deletions.
diff --git a/packages/console/src/pages/access/containers/Workspaces/index.tsx b/packages/console/src/pages/access/containers/Workspaces/index.tsx
@@ -104,7 +104,7 @@ export default function Workspaces(): JSX.Element {
                   (item: { namespace?: string; name: string }) => ({
                     namespace: item.namespace,
                     name: item.name,
-                    deleteProject: checkkboxRef.current,
+                    shouldDeleteResource: checkkboxRef.current,
                     ...params,
                   }),
                 );
@@ -167,7 +167,7 @@ export default function Workspaces(): JSX.Element {
                 const deleteParams = [record].map(item => ({
                   namespace: item.namespace,
                   name: item.name,
-                  deleteProject: checkkboxRef.current,
+                  shouldDeleteResource: checkkboxRef.current,
                   ...params,
                 }));
                 await workspaceStore.batchDelete(deleteParams);

diff --git a/packages/shared/src/stores/workspace.ts b/packages/shared/src/stores/workspace.ts
@@ -114,21 +114,14 @@ const patch = async (params: PathParams, data: Record<string, any>) => {
 
 interface DeleteWorkspaceOptions extends PathParams {
   shouldDeleteResource?: boolean;
-  deleteProject?: boolean;
 }
 
-const deleteWorkspace = ({
-  shouldDeleteResource,
-  deleteProject,
-  ...params
-}: DeleteWorkspaceOptions) => {
-  const data = !shouldDeleteResource
-    ? {
-        kind: 'DeleteOptions',
-        apiVersion: 'v1',
-        propagationPolicy: deleteProject ? 'Background' : 'Orphan',
-      }
-    : {};
+const deleteWorkspace = ({ shouldDeleteResource, ...params }: DeleteWorkspaceOptions) => {
+  const data = {
+    kind: 'DeleteOptions',
+    apiVersion: 'v1',
+    propagationPolicy: shouldDeleteResource ? 'Background' : 'Orphan',
+  };
   return request.delete<never, OriginalWorkspace, Record<string, any>>(getDetailUrl(params), {
     data,
   });