Skip to content

Commit 69430ec

Browse files
authored
fix delete namespace in control plane (#187)
* feat: do not set default value for namespace in backend Signed-off-by: warjiang <[email protected]> * fix: show cronjob and job table Signed-off-by: warjiang <[email protected]> --------- Signed-off-by: warjiang <[email protected]>
1 parent be1beb1 commit 69430ec

File tree

4 files changed

+10
-5
lines changed

4 files changed

+10
-5
lines changed

cmd/api/app/routes/unstructured/handler.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,6 @@ func handleDeleteResource(c *gin.Context) {
3939
}
4040
kind := c.Param("kind")
4141
namespace := c.Param("namespace")
42-
if namespace == "" {
43-
namespace = "default"
44-
}
4542
name := c.Param("name")
4643
deleteNow := c.Param("deleteNow") == "true"
4744

ui/apps/dashboard/src/pages/multicloud-resource-manage/namespace/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ const NamespacePage = () => {
114114
name: r.objectMeta.name,
115115
});
116116
if (ret.code === 200) {
117-
await messageApi.error(
117+
await messageApi.success(
118118
i18nInstance.t(
119119
'919994bf077d49f68f016811ffb5600e',
120120
'删除命名空间成功',

ui/apps/dashboard/src/pages/multicloud-resource-manage/workload/index.tsx

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,13 @@ const WorkloadPage = () => {
312312
columns={columns}
313313
loading={isLoading}
314314
dataSource={
315-
data ? data.deployments || data.statefulSets || data.daemonSets : []
315+
data
316+
? data.deployments ||
317+
data.statefulSets ||
318+
data.daemonSets ||
319+
data.jobs ||
320+
data.items
321+
: []
316322
}
317323
/>
318324

ui/apps/dashboard/src/services/workload.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,8 @@ export async function GetWorkloads(params: {
8181
deployments?: Workload[];
8282
statefulSets?: Workload[];
8383
daemonSets?: Workload[];
84+
jobs?: Workload[];
85+
items?: Workload[];
8486
}>
8587
>(url, {
8688
params: convertDataSelectQuery(requestData),

0 commit comments

Comments
 (0)