From 870907aae35268cc48d011a9c10384996fa63b7c Mon Sep 17 00:00:00 2001
From: "Jingwei.Zhang" <zhang.jingwei@99cloud.net>
Date: Fri, 3 Dec 2021 16:57:36 +0800
Subject: [PATCH] fix: Fix delete swift folder

Fix delete empty swift folder

Change-Id: I0c781285d35f8585df487634e656ba7464c3c78a
---
 src/client/client/base.js                     |  3 +++
 src/client/swift/index.js                     | 20 -------------------
 .../Container/Detail/actions/Delete.jsx       |  4 ++--
 3 files changed, 5 insertions(+), 22 deletions(-)

diff --git a/src/client/client/base.js b/src/client/client/base.js
index a5ca6555..49eddcf2 100644
--- a/src/client/client/base.js
+++ b/src/client/client/base.js
@@ -87,6 +87,9 @@ export default class BaseClient {
     if (!id) {
       return resourceName;
     }
+    if (!resourceName) {
+      return id;
+    }
     if (resourceName[resourceName.length - 1] === '/') {
       return `${resourceName.substr(0, resourceName.length - 1)}/${id}`;
     }
diff --git a/src/client/swift/index.js b/src/client/swift/index.js
index efec65be..67ff24aa 100644
--- a/src/client/swift/index.js
+++ b/src/client/swift/index.js
@@ -20,26 +20,6 @@ class SwiftClient extends Base {
     return swiftBase();
   }
 
-  get checkNameCode() {
-    return {
-      200: 'container exists',
-      401: 'user not login',
-      403: 'not allow to access this container',
-      404: 'not found this container',
-      500: 'other exception',
-    };
-  }
-
-  get checkNameCodeObject() {
-    return {
-      200: 'container exists',
-      401: 'user not login',
-      403: 'not allow to access this container',
-      404: 'not found this container',
-      500: 'other exception',
-    };
-  }
-
   get projectInUrl() {
     return true;
   }
diff --git a/src/pages/storage/containers/Container/Detail/actions/Delete.jsx b/src/pages/storage/containers/Container/Detail/actions/Delete.jsx
index 56401876..18b7cc47 100644
--- a/src/pages/storage/containers/Container/Detail/actions/Delete.jsx
+++ b/src/pages/storage/containers/Container/Detail/actions/Delete.jsx
@@ -59,8 +59,8 @@ export default class Delete extends ConfirmAction {
       return globalObjectStore.delete(data);
     }
     const store = new ObjectStore();
-    const { container, name: folder } = data;
-    const records = await store.fetchListByPage({ container, folder });
+    const { container, name } = data;
+    const records = await store.fetchList({ container, path: name });
     if (records.length > 0) {
       this.showConfirmErrorBeforeSubmit = true;
       this.confirmErrorMessageBeforeSubmit = t(