Merge "feat: update extra specs of volume type and QoS spec"

src/locales/en.json

@@ -1814,7 +1814,10 @@
   "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 number": "Please input a number",
+  "Please input a parameter": "Please input a parameter",
   "Please input a valid ip!": "Please input a valid ip!",
+  "Please input a value": "Please input a value",
   "Please input at least 2 characters.": "Please input at least 2 characters.",
   "Please input at least one record": "Please input at least one record",
   "Please input auth key": "Please input auth key",
@@ -1857,12 +1860,12 @@
   "Please select a file": "Please select a file",
   "Please select a file with the suffix {types}": "Please select a file with the suffix {types}",
   "Please select a network!": "Please select a network!",
+  "Please select a parameter": "Please select a parameter",
   "Please select a subnet!": "Please select a subnet!",
   "Please select a type!": "Please select a type!",
   "Please select availability zone": "Please select availability zone",
   "Please select image driver": "Please select image driver",
   "Please select item!": "Please select item!",
-  "Please select key": "Please select key",
   "Please select login type!": "Please select login type!",
   "Please select policy": "Please select policy",
   "Please select source": "Please select source",

src/locales/ko-kr.json

@@ -1814,7 +1814,10 @@
   "Please input ICMP type(0-255)": "",
   "Please input IPv4 or IPv6 cidr": "",
   "Please input IPv4 or IPv6 cidr, (e.g. 192.168.0.0/24, 2001:DB8::/48)": "",
+  "Please input a number": "숫자를 입력해주세요",
+  "Please input a parameter": "매개변수를 입력하세요.",
   "Please input a valid ip!": "",
+  "Please input a value": "값을 입력해주세요",
   "Please input at least 2 characters.": "",
   "Please input at least one record": "",
   "Please input auth key": "",
@@ -1857,12 +1860,12 @@
   "Please select a file": "파일을 선택하세요.",
   "Please select a file with the suffix {types}": "{types} 확장자를 가진 파일을 선택하세요.",
   "Please select a network!": "네트워크를 선택하세요!",
+  "Please select a parameter": "매개변수를 선택하세요.",
   "Please select a subnet!": "서브넷을 선택하세요!",
   "Please select a type!": "유형을 선택하세요!",
   "Please select availability zone": "가용 영역을 선택하세요.",
   "Please select image driver": "이미지 드라이버를 선택하세요.",
   "Please select item!": "항목을 선택하세요!",
-  "Please select key": "키를 선택하세요.",
   "Please select login type!": "로그인 유형을 선택하세요!",
   "Please select policy": "정책을 선택하세요.",
   "Please select source": "소스를 선택하세요.",

src/locales/zh-hans.json

@@ -1814,7 +1814,10 @@
   "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 number": "请输入数字",
+  "Please input a parameter": "请输入参数",
   "Please input a valid ip!": "请输入正确的IP地址",
+  "Please input a value": "请输入值",
   "Please input at least 2 characters.": "请输入至少2个字符",
   "Please input at least one record": "请输入至少一条记录",
   "Please input auth key": "请输入密钥",
@@ -1857,12 +1860,12 @@
   "Please select a file": "请选择一个文件",
   "Please select a file with the suffix {types}": "请选择后缀为{types}的文件",
   "Please select a network!": "请选择网络！",
+  "Please select a parameter": "请选择参数",
   "Please select a subnet!": "请选择子网！",
   "Please select a type!": "请选择类型！",
   "Please select availability zone": "请选择可用域",
   "Please select image driver": "请选择镜像来源",
   "Please select item!": "请选择一个条目！",
-  "Please select key": "请选择一个键",
   "Please select login type!": "请选择登录方式！",
   "Please select policy": "请选择一个策略",
   "Please select source": "请选择源",

src/pages/storage/containers/VolumeType/QosSpec/Detail/ExtraSpec/actions/Create.jsx

@@ -88,17 +88,20 @@ export class Create extends ModalAction {
     return [
       {
         name: 'keyname',
-        label: t('Key'),
+        label: t('Parameter'),
         type: 'select',
         options: this.keysMap,
-        placeholder: t('Please select key'),
+        required: true,
+        placeholder: t('Please select a parameter'),
+        getPopupContainer: () => document.body,
       },
       {
         name: 'value',
         label: t('Value'),
-        type: 'input',
+        type: 'input-number',
         placeholder: t('Please input value'),
         required: true,
+        extra: t('Please input a number'),
       },
     ];
   }
@@ -110,7 +113,7 @@ export class Create extends ModalAction {
   onSubmit = (values) => {
     const { id } = this.containerProps.detail;
     const { keyname, value } = values;
-    const qos_specs = { [keyname]: value };
+    const qos_specs = { [keyname]: value.toString() };
     return this.store.createOrUpdate(id, qos_specs);
   };
 }

src/pages/storage/containers/VolumeType/QosSpec/Detail/ExtraSpec/actions/Edit.jsx

@@ -15,6 +15,7 @@
 import { inject, observer } from 'mobx-react';
 import { ModalAction } from 'containers/Action';
 import globalQosSpecKeyStore from 'stores/cinder/qos-spec-key';
+import { isNumber } from 'lodash';
 
 export class Edit extends ModalAction {
   static id = 'edit';
@@ -44,16 +45,15 @@ export class Edit extends ModalAction {
     return [
       {
         name: 'keyname',
-        label: t('Key'),
+        label: t('Parameter'),
         type: 'input',
         disabled: true,
-        placeholder: t('Please input key'),
       },
       {
         name: 'value',
         label: t('Value'),
-        type: 'input',
+        type: 'input-number',
-        placeholder: t('Please input value'),
+        extra: t('Please input a number'),
       },
     ];
   }
@@ -65,7 +65,7 @@ export class Edit extends ModalAction {
   onSubmit = (values) => {
     const { id } = this.containerProps.detail;
     const { keyname, value } = values;
-    const qos_specs = { [keyname]: value };
+    const qos_specs = { [keyname]: isNumber(value) ? value.toString() : null };
     return this.store.createOrUpdate(id, qos_specs);
   };
 }

src/pages/storage/containers/VolumeType/QosSpec/Detail/ExtraSpec/index.jsx

@@ -32,7 +32,7 @@ export class ExtraSpecs extends Base {
 
   getColumns = () => [
     {
-      title: t('Key'),
+      title: t('Parameter'),
       dataIndex: 'keyname',
     },
     {

src/pages/storage/containers/VolumeType/VolumeType/Detail/ExtraSpec/actions/Create.jsx

@@ -41,16 +41,16 @@ export class Create extends ModalAction {
     return [
       {
         name: 'keyname',
-        label: t('Key'),
+        label: t('Parameter'),
         type: 'input',
         required: true,
-        placeholder: t('Please input key'),
+        placeholder: t('Please input a parameter'),
       },
       {
         name: 'value',
         label: t('Value'),
         type: 'input',
-        placeholder: t('Please input value'),
+        placeholder: t('Please input a value'),
         required: true,
       },
     ];

src/pages/storage/containers/VolumeType/VolumeType/Detail/ExtraSpec/actions/Edit.jsx

@@ -48,10 +48,9 @@ export class Edit extends ModalAction {
     return [
       {
         name: 'keyname',
-        label: t('Key'),
+        label: t('Parameter'),
         type: 'input',
         disabled: true,
-        placeholder: t('Please input key'),
       },
       {
         name: 'value',

src/pages/storage/containers/VolumeType/VolumeType/Detail/ExtraSpec/index.jsx

@@ -32,7 +32,7 @@ export class ExtraSpecs extends Base {
 
   getColumns = () => [
     {
-      title: t('Key'),
+      title: t('Parameter'),
       dataIndex: 'keyname',
     },
     {