fix: Fix volume restore tip

Fix volume restore tip

Change-Id: I06e42222ef33add2af294a8b9c03852958d48429

src/locales/en.json

@@ -4,11 +4,9 @@
   "-1 means no connection limit": "-1 means no connection limit",
   ".": ".",
   "1. The backup can only capture the data that has been written to the volume at the beginning of the backup task, excluding the data in the cache at that time.": "1. The backup can only capture the data that has been written to the volume at the beginning of the backup task, excluding the data in the cache at that time.",
-  "1. The cloud disk associated with the snapshot is available.": "1. The cloud disk associated with the snapshot is available.",
   "1. The name of the custom resource class property should start with CUSTOM_, can only contain uppercase letters A ~ Z, numbers 0 ~ 9 or underscores, and the length should not exceed 255 characters (for example: CUSTOM_BAREMETAL_SMALL).": "1. The name of the custom resource class property should start with CUSTOM_, can only contain uppercase letters A ~ Z, numbers 0 ~ 9 or underscores, and the length should not exceed 255 characters (for example: CUSTOM_BAREMETAL_SMALL).",
   "1. The name of the trait should start with CUSTOM_, can only contain uppercase letters A ~ Z, numbers 0 ~ 9 or underscores, and the length should not exceed 255 characters (for example: CUSTOM_TRAIT1).": "1. The name of the trait should start with CUSTOM_, can only contain uppercase letters A ~ Z, numbers 0 ~ 9 or underscores, and the length should not exceed 255 characters (for example: CUSTOM_TRAIT1).",
   "1. The volume associated with the backup is available.": "1. The volume associated with the backup is available.",
-  "2. The cloud hard disk associated with the snapshot has been mounted, and the cloud host is shut down.": "2. The cloud hard disk associated with the snapshot has been mounted, and the cloud host is shut down.",
   "2. The trait of the scheduled node needs to correspond to the trait of the flavor used by the ironic instance; by injecting the necessary traits into the ironic instance, the computing service will only schedule the instance to the bare metal node with all the necessary traits (for example, the ironic instance which use the flavor that has CUSTOM_TRAIT1 as a necessary trait, can be scheduled to the node which has the trait of CUSTOM_TRAIT1).": "2. The trait of the scheduled node needs to correspond to the trait of the flavor used by the ironic instance; by injecting the necessary traits into the ironic instance, the computing service will only schedule the instance to the bare metal node with all the necessary traits (for example, the ironic instance which use the flavor that has CUSTOM_TRAIT1 as a necessary trait, can be scheduled to the node which has the trait of CUSTOM_TRAIT1).",
   "2. The volume associated with the backup has been mounted, and the instance is shut down.": "2. The volume associated with the backup has been mounted, and the instance is shut down.",
   "2. To ensure the integrity of the data, it is recommended that you suspend the write operation of all files when creating a backup.": "2. To ensure the integrity of the data, it is recommended that you suspend the write operation of all files when creating a backup.",
@@ -296,7 +294,6 @@
   "Count": "Count",
   "Crashed": "Crashed",
   "Create": "Create",
-  "Create ": "Create ",
   "Create Allowed Address Pair": "Create Allowed Address Pair",
   "Create Application Credentials": "Create Application Credentials",
   "Create Backup": "Create Backup",
@@ -1013,7 +1010,6 @@
   "My Role": "My Role",
   "N/A": "N/A",
   "NOOP": "NOOP",
-  "NOT_FOUND_DESC": "NOT_FOUND_DESC",
   "NUMA Node": "NUMA Node",
   "NUMA Node Count": "NUMA Node Count",
   "NUMA Nodes": "NUMA Nodes",
@@ -1153,7 +1149,6 @@
   "Please input ICMP type(0-255)": "Please input ICMP type(0-255)",
   "Please input IPv4 or IPv6 cidr": "Please input IPv4 or IPv6 cidr",
   "Please input IPv4 or IPv6 cidr, (e.g. 192.168.0.0/24, 2001:DB8::/48)": "Please input IPv4 or IPv6 cidr, (e.g. 192.168.0.0/24, 2001:DB8::/48)",
-  "Please input a keyword to find": "Please input a keyword to find",
   "Please input a valid ip!": "Please input a valid ip!",
   "Please input auth key": "Please input auth key",
   "Please input cipher": "Please input cipher",
@@ -1757,7 +1752,6 @@
   "When the volume is \"bootable\" and the status is \"available\", it can be used as a startup source to create an instance.": "When the volume is \"bootable\" and the status is \"available\", it can be used as a startup source to create an instance.",
   "When you do online backup of the volume that has been bound, you need to pay attention to the following points:": "When you do online backup of the volume that has been bound, you need to pay attention to the following points:",
   "When you restore a backup, you need to meet one of the following conditions:": "When you restore a backup, you need to meet one of the following conditions:",
-  "When you restore a snapshot, one of the following conditions must be met:": "When you restore a snapshot, one of the following conditions must be met:",
   "When your Yaml file is a fixed template, variable variables can be stored in an environment variable file to implement template deployment. The parameters in the environment variable file need to match the parameters defined in the template file.": "When your Yaml file is a fixed template, variable variables can be stored in an environment variable file to implement template deployment. The parameters in the environment variable file need to match the parameters defined in the template file.",
   "Whether the Login Name can be used is up to the feasible configuration of cloud-init or cloudbase-init service in the image.": "Whether the Login Name can be used is up to the feasible configuration of cloud-init or cloudbase-init service in the image.",
   "Whether the boot device should be set only for the next reboot, or persistently.": "Whether the boot device should be set only for the next reboot, or persistently.",

src/locales/zh.json

@@ -4,11 +4,9 @@
   "-1 means no connection limit": "-1表示无连接限制",
   ".": "。",
   "1. The backup can only capture the data that has been written to the volume at the beginning of the backup task, excluding the data in the cache at that time.": "1. 备份只能捕获在备份任务开始时已经写入磁盘的数据，不包括当时位于缓存的数据。",
-  "1. The cloud disk associated with the snapshot is available.": "1. 快照关联的云硬盘处于可用状态。",
   "1. The name of the custom resource class property should start with CUSTOM_, can only contain uppercase letters A ~ Z, numbers 0 ~ 9 or underscores, and the length should not exceed 255 characters (for example: CUSTOM_BAREMETAL_SMALL).": "1. 自定义资源属性的命名应该以 CUSTOM_ 开头、只能包含大写字母A ~ Z、数字0 ~ 9或下划线、长度不超过255个字符（比如：CUSTOM_BAREMETAL_SMALL）。",
   "1. The name of the trait should start with CUSTOM_, can only contain uppercase letters A ~ Z, numbers 0 ~ 9 or underscores, and the length should not exceed 255 characters (for example: CUSTOM_TRAIT1).": "1. 特性的命名应该以 CUSTOM_ 开头、只能包含大写字母A ~ Z、数字0 ~ 9或下划线、长度不超过255个字符（比如：CUSTOM_TRAIT1）。",
   "1. The volume associated with the backup is available.": "1. 备份关联的云硬盘处于可用状态。",
-  "2. The cloud hard disk associated with the snapshot has been mounted, and the cloud host is shut down.": "2. 快照关联的云硬盘已被挂载，且云主机处于关机状态。",
   "2. The trait of the scheduled node needs to correspond to the trait of the flavor used by the ironic instance; by injecting the necessary traits into the ironic instance, the computing service will only schedule the instance to the bare metal node with all the necessary traits (for example, the ironic instance which use the flavor that has CUSTOM_TRAIT1 as a necessary trait, can be scheduled to the node which has the trait of CUSTOM_TRAIT1).": "2. 被调度节点的特性需要与裸机实例使用的云主机类型的特性对应；通过给裸机实例注入必需特性，计算服务将只调度实例到具有所有必需特性的裸金属节点（比如：调度节点的有 CUSTOM_TRAIT1 特性， 云主机类型添加CUSTOM_TRAIT1为必要特性，可以调度到此节点）。",
   "2. The volume associated with the backup has been mounted, and the instance is shut down.": "2. 备份关联的云硬盘已被挂载，且云主机处于关机状态。",
   "2. To ensure the integrity of the data, it is recommended that you suspend the write operation of all files when creating a backup.": "2. 为了保证数据的完整性，建议您在创建备份时暂停所有文件的写操作。",
@@ -296,7 +294,6 @@
   "Count": "数量",
   "Crashed": "瘫痪",
   "Create": "创建",
-  "Create ": "创建",
   "Create Allowed Address Pair": "创建可用地址对",
   "Create Application Credentials": "创建应用凭证",
   "Create Backup": "创建备份",
@@ -1013,7 +1010,6 @@
   "My Role": "我的角色",
   "N/A": "",
   "NOOP": "",
-  "NOT_FOUND_DESC": "",
   "NUMA Node": "NUMA节点",
   "NUMA Node Count": "NUMA节点数量",
   "NUMA Nodes": "NUMA节点",
@@ -1153,7 +1149,6 @@
   "Please input ICMP type(0-255)": "请输入ICMP类型(0-255)",
   "Please input IPv4 or IPv6 cidr": "请输入IPv4或IPv6网段地址",
   "Please input IPv4 or IPv6 cidr, (e.g. 192.168.0.0/24, 2001:DB8::/48)": "请输入IPv4或IPv6网段地址，（如：192.168.0.0/24, 2001:DB8::/48）",
-  "Please input a keyword to find": "",
   "Please input a valid ip!": "请输入一个有效的IP！",
   "Please input auth key": "请输入密钥",
   "Please input cipher": "请输入cipher",
@@ -1757,7 +1752,6 @@
   "When the volume is \"bootable\" and the status is \"available\", it can be used as a startup source to create an instance.": "云硬盘为“可启用”并且状态为“可用”时，可以作为启动源来创建云主机。",
   "When you do online backup of the volume that has been bound, you need to pay attention to the following points:": "当您对已经绑定的硬盘做在线备份时，需要注意以下几点：",
   "When you restore a backup, you need to meet one of the following conditions:": "当您恢复备份时，需要满足以下条件之一：",
-  "When you restore a snapshot, one of the following conditions must be met:": "当您恢复快照时，需要满足以下条件之一：",
   "When your Yaml file is a fixed template, variable variables can be stored in an environment variable file to implement template deployment. The parameters in the environment variable file need to match the parameters defined in the template file.": "当您的Yaml文件为一个固定模版时，可变变量可以存放在环境变量文件中来实现模版部署，环境变量文件中的参数需要与模版文件中定义的参数保持匹配。",
   "Whether the Login Name can be used is up to the feasible configuration of cloud-init or cloudbase-init service in the image.": "用户名是否可登录取决于镜像中的cloud-init或cloudbase-init服务的预制配置",
   "Whether the boot device should be set only for the next reboot, or persistently.": "是否永久使用该引导设置。",

src/pages/storage/containers/Volume/actions/Restore.jsx

@@ -17,11 +17,8 @@ import { VolumeStore } from 'stores/cinder/volume';
 import globalSnapshotStore from 'stores/cinder/snapshot';
 import { volumeStatus } from 'resources/volume';
 import { getSinceTime } from 'utils/time';
-import { revertTip } from 'resources/snapshot';
 
-@inject('rootStore')
+export class RestoreAction extends ModalAction {
-@observer
-export default class RestoreAction extends ModalAction {
   static id = 'Restore from snapshot';
 
   static title = t('Restore from snapshot');
@@ -99,10 +96,6 @@ export default class RestoreAction extends ModalAction {
     ];
   }
 
-  get tips() {
-    return revertTip;
-  }
-
   get name() {
     return t('Restore from snapshot');
   }
@@ -119,3 +112,5 @@ export default class RestoreAction extends ModalAction {
     return this.store.revert(id, { snapshot_id: selectedRowKeys[0] });
   };
 }
+
+export default inject('rootStore')(observer(RestoreAction));

src/resources/snapshot.jsx

@@ -1,19 +0,0 @@
-import React from 'react';
-
-export const revertTip = (
-  <span>
-    <span style={{ fontWeight: 600 }}>
-      {t(
-        'When you restore a snapshot, one of the following conditions must be met:'
-      )}
-    </span>
-    <p style={{ paddingLeft: 20 }} className="tip">
-      {t('1. The cloud disk associated with the snapshot is available.')}
-    </p>
-    <p style={{ paddingLeft: 20 }} className="tip">
-      {t(
-        '2. The cloud hard disk associated with the snapshot has been mounted, and the cloud host is shut down.'
-      )}
-    </p>
-  </span>
-);