From 925c0ead0b1b2128ab13d2d38c618a80874cb63f Mon Sep 17 00:00:00 2001
From: zhangjingwei <zhang.jingwei@99cloud.net>
Date: Thu, 29 Jul 2021 08:51:01 +0800
Subject: [PATCH] fix: Fix locked value in instance download csv etc.

1. Fix locked value in instance download csv
2. Hide custom column button in hypervisor page
3. Fix storage backend name

Change-Id: I7ee66e7688be03863706977a80912f12b9386671
---
 src/locales/en.json                                          | 5 +++--
 src/locales/zh.json                                          | 5 +++--
 .../compute/containers/Hypervisors/Hypervisor/index.jsx      | 4 ++++
 src/pages/compute/containers/Instance/index.jsx              | 1 +
 src/pages/storage/containers/Volume/actions/Migrate.jsx      | 4 ++--
 5 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/locales/en.json b/src/locales/en.json
index 91d84e97..1c3121fc 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -377,7 +377,7 @@
   "Current Project Network": "Current Project Network",
   "Current Project QoS Policy": "Current Project QoS Policy",
   "Current QoS policy name": "Current QoS policy name",
-  "Current Storage Pool": "Current Storage Pool",
+  "Current Storage Backend": "Current Storage Backend",
   "Current data downloaded.": "Current data downloaded.",
   "Custom": "Custom",
   "Custom ICMP Rule": "Custom ICMP Rule",
@@ -1044,6 +1044,7 @@
   "Not Implemented (code: 501) ": "Not Implemented (code: 501) ",
   "Not Open": "Not Open",
   "Not deleted with the instance": "Not deleted with the instance",
+  "Not locked": "Not locked",
   "Not select": "Not select",
   "Not yet bound": "Not yet bound",
   "Not yet selected": "Not yet selected",
@@ -1524,7 +1525,7 @@
   "Target Compute Host": "Target Compute Host",
   "Target IP Address": "Target IP Address",
   "Target Port": "Target Port",
-  "Target Storage Pool": "Target Storage Pool",
+  "Target Storage Backend": "Target Storage Backend",
   "Target Subnet": "Target Subnet",
   "Template Content": "Template Content",
   "Template Name": "Template Name",
diff --git a/src/locales/zh.json b/src/locales/zh.json
index e0f07884..c3b8c139 100644
--- a/src/locales/zh.json
+++ b/src/locales/zh.json
@@ -377,7 +377,7 @@
   "Current Project Network": "当前项目网络",
   "Current Project QoS Policy": "当前项目QoS策略",
   "Current QoS policy name": "当前QoS策略名称",
-  "Current Storage Pool": "当前资源池",
+  "Current Storage Backend": "当前存储后端",
   "Current data downloaded.": "当前数据已完成下载。",
   "Custom": "自定义",
   "Custom ICMP Rule": "定制ICMP规则",
@@ -1044,6 +1044,7 @@
   "Not Implemented (code: 501) ": "服务器不支持请求（错误码：501）",
   "Not Open": "未开放",
   "Not deleted with the instance": "不随云主机删除",
+  "Not locked": "未锁定",
   "Not select": "不选择",
   "Not yet bound": "尚未绑定",
   "Not yet selected": "尚未选择",
@@ -1524,7 +1525,7 @@
   "Target Compute Host": "目标计算节点",
   "Target IP Address": "目标IP地址",
   "Target Port": "目标网卡",
-  "Target Storage Pool": "目标资源池",
+  "Target Storage Backend": "目标存储后端",
   "Target Subnet": "目标子网",
   "Template Content": "模板内容",
   "Template Name": "模板名称",
diff --git a/src/pages/compute/containers/Hypervisors/Hypervisor/index.jsx b/src/pages/compute/containers/Hypervisors/Hypervisor/index.jsx
index 70922c2a..9079e05b 100644
--- a/src/pages/compute/containers/Hypervisors/Hypervisor/index.jsx
+++ b/src/pages/compute/containers/Hypervisors/Hypervisor/index.jsx
@@ -40,6 +40,10 @@ export default class Hypervisors extends Base {
     return false;
   }
 
+  get hideCustom() {
+    return true;
+  }
+
   getColumns = () => {
     const columns = [...hypervisorColumns];
     columns[0] = {
diff --git a/src/pages/compute/containers/Instance/index.jsx b/src/pages/compute/containers/Instance/index.jsx
index 239779f9..b63d6d48 100644
--- a/src/pages/compute/containers/Instance/index.jsx
+++ b/src/pages/compute/containers/Instance/index.jsx
@@ -198,6 +198,7 @@ export default class Instance extends Base {
         isHideable: true,
         render: lockRender,
         width: 80,
+        stringify: (value) => (value ? t('Locked') : t('Not locked')),
       },
       {
         title: t('Created At'),
diff --git a/src/pages/storage/containers/Volume/actions/Migrate.jsx b/src/pages/storage/containers/Volume/actions/Migrate.jsx
index 651f1c93..f492e92e 100644
--- a/src/pages/storage/containers/Volume/actions/Migrate.jsx
+++ b/src/pages/storage/containers/Volume/actions/Migrate.jsx
@@ -79,13 +79,13 @@ export default class Migrate extends ModalAction {
       },
       {
         name: 'host',
-        label: t('Current Storage Pool'),
+        label: t('Current Storage Backend'),
         type: 'label',
         iconType: 'instance',
       },
       {
         name: 'pool',
-        label: t('Target Storage Pool'),
+        label: t('Target Storage Backend'),
         type: 'select-table',
         required: true,
         datas: this.pools,