diff --git a/src/components/Tags/index.jsx b/src/components/Tags/index.jsx index 5c9b1b02..68281a67 100644 --- a/src/components/Tags/index.jsx +++ b/src/components/Tags/index.jsx @@ -155,7 +155,7 @@ const Tags = ({ tags: source, onChange, maxLength, maxCount }) => { )} {!inputVisible && ( - New Tag + {t('New Tag')} )} diff --git a/src/locales/en.json b/src/locales/en.json index 6f7c7c47..c3d086df 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -66,6 +66,7 @@ "Adopt Complete": "Adopt Complete", "Adopt Failed": "Adopt Failed", "Adopt In Progress": "Adopt In Progress", + "Advanced": "Advanced", "Advanced Options": "Advanced Options", "Advanced Params": "Advanced Params", "Affiliated Domain": "Affiliated Domain", @@ -95,6 +96,7 @@ "Allocate IP": "Allocate IP", "Allocation Pools": "Allocation Pools", "Allowed Address Pair": "Allowed Address Pair", + "Allowed Host": "Allowed Host", "American Samoa": "American Samoa", "An object with the same name already exists": "An object with the same name already exists", "Andorra": "Andorra", @@ -173,6 +175,8 @@ "Backing Up": "Backing Up", "Backup": "Backup", "Backup Detail": "Backup Detail", + "Backup File": "Backup File", + "Backup File Location": "Backup File Location", "Backup Mode": "Backup Mode", "Backup Name": "Backup Name", "Backups": "Backups", @@ -331,6 +335,10 @@ "Conductor Migrate Server": "Conductor Migrate Server", "Config Overview": "Config Overview", "Configuration": "Configuration", + "Configuration Detail": "Configuration Detail", + "Configuration Group": "Configuration Group", + "Configuration Group Name": "Configuration Group Name", + "Configuration Groups": "Configuration Groups", "Configuration Update": "Configuration Update", "Configured Memory (GB)": "Configured Memory (GB)", "Confirm": "Confirm", @@ -342,6 +350,8 @@ "Connect Subnet": "Connect Subnet", "Connect router": "Connect router", "Connected Threads": "Connected Threads", + "Connection Examples": "Connection Examples", + "Connection Information": "Connection Information", "Connection Limit": "Connection Limit", "Console": "Console", "Console Interface": "Console Interface", @@ -365,9 +375,11 @@ "Create Allowed Address Pair": "Create Allowed Address Pair", "Create Application Credentials": "Create Application Credentials", "Create Backup": "Create Backup", + "Create Backups": "Create Backups", "Create Bandwidth Limit Rule": "Create Bandwidth Limit Rule", "Create Bare Metal Node": "Create Bare Metal Node", "Create Complete": "Create Complete", + "Create Configurations": "Create Configurations", "Create Container": "Create Container", "Create DNAT Rule": "Create DNAT Rule", "Create DNAT rule": "Create DNAT rule", @@ -483,12 +495,19 @@ "Data Source Type": "Data Source Type", "Database": "Database", "Database Instance": "Database Instance", + "Database Name": "Database Name", + "Database Port": "Database Port", "Database Service": "Database Service", + "Databases": "Databases", + "Datastore": "Datastore", + "Datastore Type": "Datastore Type", + "Datastore Version": "Datastore Version", "Deactivated": "Deactivated", "Debian": "Debian", "Dedicated": "Dedicated", "Default Policy": "Default Policy", "Default is slaac, for details, see https://docs.openstack.org/neutron/latest/admin/config-ipv6.html": "Default is slaac, for details, see https://docs.openstack.org/neutron/latest/admin/config-ipv6.html", + "Defaults": "Defaults", "Degraded": "Degraded", "Delay Interval(s)": "Delay Interval(s)", "Delete": "Delete", @@ -498,9 +517,11 @@ "Delete Bandwidth Egress Rules": "Delete Bandwidth Egress Rules", "Delete Bandwidth Ingress Rules": "Delete Bandwidth Ingress Rules", "Delete Complete": "Delete Complete", + "Delete Configuration": "Delete Configuration", "Delete Container": "Delete Container", "Delete DNAT Rule": "Delete DNAT Rule", "Delete DSCP Marking Rules": "Delete DSCP Marking Rules", + "Delete Database": "Delete Database", "Delete Default Pool": "Delete Default Pool", "Delete Domain": "Delete Domain", "Delete Encryption": "Delete Encryption", @@ -557,6 +578,7 @@ "Description": "Description", "Dest Folder": "Dest Folder", "Destination CIDR": "Destination CIDR", + "Destination Port/Port Range": "Destination Port/Port Range", "Detach": "Detach", "Detach Instance": "Detach Instance", "Detach Interface": "Detach Interface", @@ -567,6 +589,7 @@ "Detail": "Detail", "Detail Info": "Detail Info", "Details": "Details", + "Details *": "Details *", "Device ID": "Device ID", "Device Owner": "Device Owner", "Direct": "Direct", @@ -734,6 +757,7 @@ "Failed": "Failed", "Falkland Islands (Malvinas)": "Falkland Islands (Malvinas)", "Faroe Islands": "Faroe Islands", + "Fault": "Fault", "Fedora": "Fedora", "Fiji": "Fiji", "File": "File", @@ -800,6 +824,7 @@ "Gateway IP": "Gateway IP", "Gateway Time-out (code: 504) ": "Gateway Time-out (code: 504) ", "Gateway ip {gateway_ip} conflicts with allocation pool {pool}": "Gateway ip {gateway_ip} conflicts with allocation pool {pool}", + "General Info": "General Info", "General Purpose": "General Purpose", "Georgia": "Georgia", "Germany": "Germany", @@ -940,6 +965,7 @@ "In the last hour": "In the last hour", "In-use": "In-use", "Increment Backup": "Increment Backup", + "Incremental": "Incremental", "Incremental Backup": "Incremental Backup", "India": "India", "Indicates whether this VPN can only respond to connections or both respond to and initiate connections.": "Indicates whether this VPN can only respond to connections or both respond to and initiate connections.", @@ -949,7 +975,12 @@ "Init Complete": "Init Complete", "Init Failed": "Init Failed", "Init In Progress": "Init In Progress", + "Initial Admin User": "Initial Admin User", + "Initial Databases": "Initial Databases", + "Initial Volume Size": "Initial Volume Size", + "Initialize Databases": "Initialize Databases", "Initiator Mode": "Initiator Mode", + "Input destination port or port range(example: 80 or 80:160)": "Input destination port or port range(example: 80 or 80:160)", "Input source port or port range(example: 80 or 80:160)": "Input source port or port range(example: 80 or 80:160)", "Inspect Failed": "Inspect Failed", "Inspecting": "Inspecting", @@ -979,6 +1010,7 @@ "Instance Detail": "Instance Detail", "Instance IP": "Instance IP", "Instance Info": "Instance Info", + "Instance Name": "Instance Name", "Instance Status": "Instance Status", "Instances": "Instances", "Instances \"{ name }\" are locked, can not delete them.": "Instances \"{ name }\" are locked, can not delete them.", @@ -1106,15 +1138,18 @@ "Local Network": "Local Network", "Local SSD": "Local SSD", "Local Subnet": "Local Subnet", + "Locality": "Locality", "Lock": "Lock", "Lock Instance": "Lock Instance", "Lock Status": "Lock Status", "Lock instance will lock the operations that have a direct impact on the operation of the instance, such as shutdown, restart, delete, etc. It does not involve the mounting, unmounting and capacity expansion of volume.": "Lock instance will lock the operations that have a direct impact on the operation of the instance, such as shutdown, restart, delete, etc. It does not involve the mounting, unmounting and capacity expansion of volume.", "Locked": "Locked", + "Log": "Log", "Log in": "Log in", "Login Name": "Login Name", "Login Password": "Login Password", "Login Type": "Login Type", + "Logs": "Logs", "Luxembourg": "Luxembourg", "MAC Address": "MAC Address", "MAC Learning State": "MAC Learning State", @@ -1176,6 +1211,7 @@ "Memory Usage": "Memory Usage", "Memory usage Num (GB": "Memory usage Num (GB", "Message": "Message", + "Message Details": "Message Details", "Message Queue Service": "Message Queue Service", "Metadata": "Metadata", "Metadata Definitions": "Metadata Definitions", @@ -1244,6 +1280,7 @@ "Network Traffic": "Network Traffic", "Network topology page": "Network topology page", "Networking": "Networking", + "Networking *": "Networking *", "Networking service:": "Networking service:", "Networks": "Networks", "Neutron Agent Detail": "Neutron Agent Detail", @@ -1252,6 +1289,7 @@ "New": "New", "New Availability Zone": "New Availability Zone", "New Caledonia": "New Caledonia", + "New Tag": "New Tag", "New Zealand": "New Zealand", "Next": "Next", "Next Hop": "Next Hop", @@ -1289,6 +1327,7 @@ "Nova Service": "Nova Service", "Number Of Ports": "Number Of Ports", "Number of GPU": "Number of GPU", + "Number of Nodes": "Number of Nodes", "Number of Usb Controller": "Number of Usb Controller", "OK": "OK", "OS": "OS", @@ -1693,6 +1732,7 @@ "Service": "Service", "Service State": "Service State", "Service Status": "Service Status", + "Service Status Updated": "Service Status Updated", "Service Unavailable (code: 503) ": "Service Unavailable (code: 503) ", "Services": "Services", "Set Admin Password": "Set Admin Password", @@ -1722,6 +1762,8 @@ "Sign up": "Sign up", "Singapore": "Singapore", "Size": "Size", + "Size (GB)": "Size (GB)", + "Size of image to launch": "Size of image to launch", "Slovakia (Slovak Republic)": "Slovakia (Slovak Republic)", "Slovenia": "Slovenia", "Slow Query": "Slow Query", @@ -1756,6 +1798,7 @@ "Spain": "Spain", "Spawning": "Spawning", "Specification": "Specification", + "Specify whether future replicated instances will be created on the same hypervisor (affinity) or on different hypervisors (anti-affinity). This value is ignored if the instance to be launched is a replica.": "Specify whether future replicated instances will be created on the same hypervisor (affinity) or on different hypervisors (anti-affinity). This value is ignored if the instance to be launched is a replica.", "Specs": "Specs", "Sri Lanka": "Sri Lanka", "Stack Detail": "Stack Detail", @@ -1852,6 +1895,7 @@ "Target Storage Backend": "Target Storage Backend", "Template Content": "Template Content", "Template Name": "Template Name", + "Tenant Id": "Tenant Id", "Thailand": "Thailand", "That is, after how many consecutive failures of the health check, the health check status of the back-end cloud server is changed from normal to abnormal": "That is, after how many consecutive failures of the health check, the health check status of the back-end cloud server is changed from normal to abnormal", "The Federation of Saint Kitts and Nevis": "The Federation of Saint Kitts and Nevis", @@ -1962,6 +2006,7 @@ "Turks and Caicos Islands": "Turks and Caicos Islands", "Tuvalu": "Tuvalu", "Type": "Type", + "Type of datastore": "Type of datastore", "UDPLite": "UDPLite", "USB Info": "USB Info", "USB Parameters": "USB Parameters", @@ -2013,6 +2058,7 @@ "Update Template": "Update Template", "Update User Password": "Update User Password", "Update user password": "Update user password", + "Updated": "Updated", "Updated At": "Updated At", "Updating": "Updating", "Updating Password": "Updating Password", @@ -2074,11 +2120,13 @@ "VRRP": "VRRP", "Valid": "Valid", "Value": "Value", + "Values": "Values", "Vanuatu": "Vanuatu", "Vatican City State (Holy See)": "Vatican City State (Holy See)", "Vendor Interface": "Vendor Interface", "Venezuela": "Venezuela", "Verifying": "Verifying", + "Version of datastore": "Version of datastore", "Vietnam": "Vietnam", "View": "View", "View Detail": "View Detail", @@ -2101,6 +2149,7 @@ "Volume ID/Name": "Volume ID/Name", "Volume Info": "Volume Info", "Volume Name": "Volume Name", + "Volume Size": "Volume Size", "Volume Snapshot": "Volume Snapshot", "Volume Source": "Volume Source", "Volume Transfer": "Volume Transfer", @@ -2170,6 +2219,7 @@ "cinder services": "cinder services", "compute hosts": "compute hosts", "compute services": "compute services", + "configurations": "configurations", "confirm resize or migrate": "confirm resize or migrate", "connect subnet": "connect subnet", "container objects": "container objects", diff --git a/src/locales/zh.json b/src/locales/zh.json index b222c5fb..79e95cef 100644 --- a/src/locales/zh.json +++ b/src/locales/zh.json @@ -66,6 +66,7 @@ "Adopt Complete": "配置完成", "Adopt Failed": "配置失败", "Adopt In Progress": "正在启用配置", + "Advanced": "高级", "Advanced Options": "高级选项", "Advanced Params": "高级参数", "Affiliated Domain": "所属域", @@ -95,6 +96,7 @@ "Allocate IP": "申请IP", "Allocation Pools": "分配地址池", "Allowed Address Pair": "可用地址对", + "Allowed Host": "可用主机", "American Samoa": "萨摩亚", "An object with the same name already exists": "已存在同名对象", "Andorra": "安道尔共和国", @@ -173,6 +175,8 @@ "Backing Up": "备份中", "Backup": "备份", "Backup Detail": "备份详情", + "Backup File": "备份文件", + "Backup File Location": "备份文件地址", "Backup Mode": "备份方式", "Backup Name": "备份名称", "Backups": "备份", @@ -331,6 +335,10 @@ "Conductor Migrate Server": "执行迁移服务器", "Config Overview": "配置概览", "Configuration": "配置", + "Configuration Detail": "配置详情", + "Configuration Group": "配置组", + "Configuration Group Name": "配置组名称", + "Configuration Groups": "配置组", "Configuration Update": "配置变更", "Configured Memory (GB)": "已分配内存(GB)", "Confirm": "确定", @@ -342,6 +350,8 @@ "Connect Subnet": "连接子网", "Connect router": "连接路由", "Connected Threads": "", + "Connection Examples": "连接示例", + "Connection Information": "连接信息", "Connection Limit": "连接限制", "Console": "控制台", "Console Interface": "Console接口", @@ -365,9 +375,11 @@ "Create Allowed Address Pair": "创建可用地址对", "Create Application Credentials": "创建应用凭证", "Create Backup": "创建备份", + "Create Backups": "创建备份", "Create Bandwidth Limit Rule": "创建带宽限制规则", "Create Bare Metal Node": "创建裸机节点", "Create Complete": "创建完成", + "Create Configurations": "创建配置", "Create Container": "创建容器", "Create DNAT Rule": "创建DNAT规则", "Create DNAT rule": "创建DNAT规则", @@ -483,12 +495,19 @@ "Data Source Type": "数据源类型", "Database": "数据库", "Database Instance": "数据库实例", + "Database Name": "数据库名称", + "Database Port": "数据库端口", "Database Service": "数据库服务", + "Databases": "数据库", + "Datastore": "数据存储", + "Datastore Type": "数据存储类型", + "Datastore Version": "数据存储版本", "Deactivated": "已取消激活", "Debian": "", "Dedicated": "专用", "Default Policy": "默认策略", "Default is slaac, for details, see https://docs.openstack.org/neutron/latest/admin/config-ipv6.html": "默认使用slaac模式，详细配置方式请查看 https://docs.openstack.org/neutron/latest/admin/config-ipv6.html", + "Defaults": "默认", "Degraded": "降级", "Delay Interval(s)": "检查间隔(秒)", "Delete": "删除", @@ -498,9 +517,11 @@ "Delete Bandwidth Egress Rules": "删除带宽出方向限制", "Delete Bandwidth Ingress Rules": "删除带宽入方向限制", "Delete Complete": "删除完成", + "Delete Configuration": "删除配置", "Delete Container": "删除容器", "Delete DNAT Rule": "删除DNAT规则", "Delete DSCP Marking Rules": "删除DSCP标记规则", + "Delete Database": "删除数据库", "Delete Default Pool": "删除资源池", "Delete Domain": "删除域", "Delete Encryption": "删除加密", @@ -557,6 +578,7 @@ "Description": "描述", "Dest Folder": "目标文件夹", "Destination CIDR": "目的网络地址", + "Destination Port/Port Range": "目的端口/端口范围", "Detach": "解绑", "Detach Instance": "从云主机解绑", "Detach Interface": "卸载网卡", @@ -567,6 +589,7 @@ "Detail": "详情", "Detail Info": "详情信息", "Details": "详情", + "Details *": "详情 *", "Device ID": "设备ID", "Device Owner": "设备所属者", "Direct": "方向", @@ -734,6 +757,7 @@ "Failed": "失败", "Falkland Islands (Malvinas)": "福克兰群岛", "Faroe Islands": "法罗群岛", + "Fault": "错误", "Fedora": "", "Fiji": "斐济", "File": "文件", @@ -800,6 +824,7 @@ "Gateway IP": "网关IP", "Gateway Time-out (code: 504) ": "网关超时（错误码：504 ）", "Gateway ip {gateway_ip} conflicts with allocation pool {pool}": "网关地址 {gateway_ip} 和分配地址池 {pool} 冲突", + "General Info": "通用信息", "General Purpose": "通用型", "Georgia": "格鲁吉亚", "Germany": "德国", @@ -940,6 +965,7 @@ "In the last hour": "最近1小时", "In-use": "正在使用", "Increment Backup": "增量备份", + "Incremental": "增量", "Incremental Backup": "增量备份", "India": "印度", "Indicates whether this VPN can only respond to connections or both respond to and initiate connections.": "指示此VPN是仅响应连接还是同时响应和发起连接。", @@ -949,7 +975,12 @@ "Init Complete": "初始化完成", "Init Failed": "初始化失败", "Init In Progress": "正在初始化", + "Initial Admin User": "初始管理员用户", + "Initial Databases": "初始数据库", + "Initial Volume Size": "初始硬盘容量", + "Initialize Databases": "初始数据库", "Initiator Mode": "发起模式", + "Input destination port or port range(example: 80 or 80:160)": "目的端口或端口范围（例如：80 或 80:160）", "Input source port or port range(example: 80 or 80:160)": "源端口或源端口范围(例如: 80 或 80:160)", "Inspect Failed": "检查失败", "Inspecting": "检查", @@ -979,6 +1010,7 @@ "Instance Detail": "云主机详情", "Instance IP": "云主机IP", "Instance Info": "云主机信息", + "Instance Name": "云主机名称", "Instance Status": "云主机状态", "Instances": "云主机", "Instances \"{ name }\" are locked, can not delete them.": "云主机\"{ name }\"被锁定，无法删除。", @@ -1106,15 +1138,18 @@ "Local Network": "本端网络", "Local SSD": "本地SSD", "Local Subnet": "本端子网", + "Locality": "本地", "Lock": "锁定", "Lock Instance": "锁定云主机", "Lock Status": "锁定状态", "Lock instance will lock the operations that have a direct impact on the operation of the instance, such as shutdown, restart, delete, etc. It does not involve the mounting, unmounting and capacity expansion of volume.": "云主机锁定操作会锁定对云主机运行有直接影响的操作, 例如: 关机, 重启, 删除等，不涉及云硬盘的挂载卸载和扩容。", "Locked": "锁定", + "Log": "日志", "Log in": "登录", "Login Name": "登录名", "Login Password": "登录密码", "Login Type": "登录凭证", + "Logs": "日志", "Luxembourg": "卢森堡", "MAC Address": "MAC地址", "MAC Learning State": "MAC学习状态", @@ -1176,6 +1211,7 @@ "Memory Usage": "内存使用量", "Memory usage Num (GB": "内存用量 (GB)", "Message": "消息", + "Message Details": "消息详情", "Message Queue Service": "消息队列服务", "Metadata": "元数据", "Metadata Definitions": "元数据定义", @@ -1244,6 +1280,7 @@ "Network Traffic": "网络流量", "Network topology page": "网络拓扑页面", "Networking": "创建网络中", + "Networking *": "网络 *", "Networking service:": "网络服务(neutron):", "Networks": "网络", "Neutron Agent Detail": "网络服务详情", @@ -1252,6 +1289,7 @@ "New": "新建", "New Availability Zone": "新可用域", "New Caledonia": "新喀里多尼亚", + "New Tag": "新标签", "New Zealand": "新西兰", "Next": "下一步", "Next Hop": "下一跳", @@ -1289,6 +1327,7 @@ "Nova Service": "计算服务", "Number Of Ports": "端口数量", "Number of GPU": "GPU数量", + "Number of Nodes": "节点数量", "Number of Usb Controller": "USB控制器数量", "OK": "", "OS": "操作系统", @@ -1693,6 +1732,7 @@ "Service": "服务", "Service State": "服务状态", "Service Status": "管理状态", + "Service Status Updated": "服务状态更新", "Service Unavailable (code: 503) ": "服务不可用（错误码：503 ）", "Services": "服务", "Set Admin Password": "设置管理员密码", @@ -1722,6 +1762,8 @@ "Sign up": "注册", "Singapore": "新加坡", "Size": "容量", + "Size (GB)": "容量 (GB)", + "Size of image to launch": "启动的镜像大小", "Slovakia (Slovak Republic)": "斯洛伐克", "Slovenia": "斯洛文尼亚", "Slow Query": "", @@ -1756,6 +1798,7 @@ "Spain": "西班牙", "Spawning": "孵化中", "Specification": "规格", + "Specify whether future replicated instances will be created on the same hypervisor (affinity) or on different hypervisors (anti-affinity). This value is ignored if the instance to be launched is a replica.": "指定未来的复制实例是在相同的管理程序（亲和）上创建还是在不同的管理程序（反亲和）上创建。如果要启动的实例是副本，则忽略此值。", "Specs": "规格", "Sri Lanka": "斯里兰卡", "Stack Detail": "Stack堆栈详情", @@ -1852,6 +1895,7 @@ "Target Storage Backend": "目标存储后端", "Template Content": "模板内容", "Template Name": "模板名称", + "Tenant Id": "项目ID", "Thailand": "泰国", "That is, after how many consecutive failures of the health check, the health check status of the back-end cloud server is changed from normal to abnormal": "即健康检查连续失败多少次后，将后端云服务器的健康检查状态由正常改为不正常", "The Federation of Saint Kitts and Nevis": "圣基茨和尼维斯", @@ -1962,6 +2006,7 @@ "Turks and Caicos Islands": "土克斯及开科斯群岛", "Tuvalu": "图瓦卢", "Type": "类型", + "Type of datastore": "数据存储类型", "UDPLite": "", "USB Info": "USB 信息", "USB Parameters": "USB参数", @@ -2013,6 +2058,7 @@ "Update Template": "更新模板", "Update User Password": "修改用户密码", "Update user password": "修改用户密码", + "Updated": "更新于", "Updated At": "更新于", "Updating": "更新中", "Updating Password": "更新密码中", @@ -2074,11 +2120,13 @@ "VRRP": "", "Valid": "有效", "Value": "值", + "Values": "值", "Vanuatu": "瓦努阿图", "Vatican City State (Holy See)": "梵蒂冈", "Vendor Interface": "", "Venezuela": "委内瑞拉", "Verifying": "验证", + "Version of datastore": "数据存储版本", "Vietnam": "越南", "View": "查看", "View Detail": "查看详情", @@ -2101,6 +2149,7 @@ "Volume ID/Name": "云硬盘ID/名称", "Volume Info": "云硬盘信息", "Volume Name": "云硬盘名称", + "Volume Size": "云硬盘容量", "Volume Snapshot": "云硬盘快照", "Volume Source": "云硬盘源", "Volume Transfer": "云硬盘传输", @@ -2170,6 +2219,7 @@ "cinder services": "存储服务", "compute hosts": "计算节点", "compute services": "计算服务", + "configurations": "配置", "confirm resize or migrate": "确认修改配置/迁移", "connect subnet": "连接子网", "container objects": "容器对象", diff --git a/src/pages/database/containers/Instances/actions/index.jsx b/src/pages/database/containers/Instances/actions/index.jsx index 8c050ac0..acad611f 100644 --- a/src/pages/database/containers/Instances/actions/index.jsx +++ b/src/pages/database/containers/Instances/actions/index.jsx @@ -19,7 +19,8 @@ const actionConfigs = { rowActions: { firstAction: Delete, }, - primaryActions: [StepCreate] + primaryActions: [StepCreate], + batchActions: [Delete], }; export default actionConfigs; diff --git a/src/pages/database/containers/Instances/index.jsx b/src/pages/database/containers/Instances/index.jsx index 1303a856..be5cbb0a 100644 --- a/src/pages/database/containers/Instances/index.jsx +++ b/src/pages/database/containers/Instances/index.jsx @@ -14,8 +14,9 @@ import { observer, inject } from 'mobx-react'; import Base from 'containers/List'; -import actions from './actions'; import globalInstancesStore from '@/stores/trove/instances'; +import { InstanceStatus } from 'resources/database'; +import actions from './actions'; @inject('rootStore') @observer @@ -52,28 +53,29 @@ export default class Instances extends Base { routeName: this.getRouteName('databaseInstanceDetail'), }, { - title: t("Datastore"), - dataIndex: "datastore.type" + title: t('Datastore'), + dataIndex: 'datastore.type', }, { - title: t("Datastore Version"), - dataIndex: "datastore.version", + title: t('Datastore Version'), + dataIndex: 'datastore.version', isHideable: true, }, { - title: t("Host"), - dataIndex: "ip", + title: t('Host'), + dataIndex: 'ip', isHideable: true, }, { title: t('Volume Size'), dataIndex: 'volume', isHideable: true, - render: (value) => value ? value.size + "GB" : "-" + render: (value) => (value ? `${value.size}GB` : '-'), }, { title: t('Status'), dataIndex: 'status', + render: (value) => InstanceStatus[value], }, ]; -} \ No newline at end of file +} diff --git a/src/resources/database.js b/src/resources/database.js new file mode 100644 index 00000000..4d79de89 --- /dev/null +++ b/src/resources/database.js @@ -0,0 +1,28 @@ +// Copyright 2021 99cloud +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +import { instanceStatus } from 'resources/instance'; + +export const InstanceStatus = { + ...instanceStatus, + BUILD: t('Building'), + ACTIVE: t('Active'), + ERROR: t('Error'), + DELETE: t('Delete'), + MIGRATE: t('Migrate'), + RESIZE: t('Resize'), + REBOOT: t('Reboot'), + PROMOTE: t('Promote'), + EJECT: t('Eject'), +}; diff --git a/src/stores/overview-admin.js b/src/stores/overview-admin.js index 3cb9923a..a8f175f4 100644 --- a/src/stores/overview-admin.js +++ b/src/stores/overview-admin.js @@ -14,7 +14,7 @@ import { extendObservable, action } from 'mobx'; import client from 'client'; -import globalRootStore from './root'; +import globalRootStore from 'stores/root'; export default class OverviewStore { constructor() {