From e1567f72d42f65219bfa17f4df285ef7bd6046c6 Mon Sep 17 00:00:00 2001 From: xusongfu Date: Thu, 11 Aug 2022 17:28:01 +0800 Subject: [PATCH] fix: fix the data showing if not matched show the origin data if not matched with defined collections Change-Id: Ibb99080bbf6fa0504dfc386e1ee0be38dbc77bbe --- docs/en/develop/3-1-BaseList-introduction.md | 8 ++++---- docs/en/develop/3-3-BaseDetail-introduction.md | 2 +- docs/zh/develop/3-1-BaseList-introduction.md | 8 ++++---- docs/zh/develop/3-3-BaseDetail-introduction.md | 2 +- src/components/Popover/PopoverNetworks.jsx | 2 +- src/pages/compute/containers/Flavor/Detail/BaseDetail.jsx | 6 +++--- .../HostAggregate/Aggregate/actions/ManageHost.jsx | 4 ++-- .../compute/containers/Hypervisors/ComputeHost/index.jsx | 4 ++-- src/pages/compute/containers/Image/Detail/BaseDetail.jsx | 4 ++-- src/pages/compute/containers/Image/Image.jsx | 8 ++++---- .../containers/Instance/actions/DetachInterface.jsx | 2 +- .../compute/containers/Instance/actions/DetachVolume.jsx | 2 +- .../Instance/actions/StepCreate/BaseStep/index.jsx | 6 +++--- .../Instance/actions/StepCreate/SystemStep/index.jsx | 2 +- src/pages/compute/containers/ServerGroup/Detail/index.jsx | 2 +- src/pages/compute/containers/ServerGroup/index.jsx | 2 +- .../containers/SystemInfo/CinderService/index.jsx | 4 ++-- .../containers/SystemInfo/ComputeService/index.jsx | 4 ++-- .../configuration/containers/SystemInfo/HeatService.jsx | 2 +- src/pages/network/containers/FloatingIp/index.jsx | 2 +- src/pages/network/containers/Network/Detail/Subnets.jsx | 2 +- .../network/containers/Router/Port/Detail/BaseDetail.jsx | 2 +- src/pages/network/containers/Router/Port/index.jsx | 2 +- src/pages/network/containers/Router/actions/Create.jsx | 4 ++-- .../network/containers/Router/actions/SetGateway.jsx | 2 +- src/pages/network/containers/Topology/NodeCard.jsx | 2 +- .../containers/VirtualAdapter/Detail/BaseDetail/index.jsx | 2 +- src/pages/storage/containers/Backup/Detail/index.jsx | 2 +- src/pages/storage/containers/Backup/index.jsx | 2 +- src/pages/storage/containers/Snapshot/index.jsx | 2 +- src/pages/storage/containers/Volume/Detail/index.jsx | 2 +- .../storage/containers/Volume/actions/Create/index.jsx | 2 +- src/pages/storage/containers/Volume/actions/Restore.jsx | 2 +- .../containers/VolumeType/QosSpec/Detail/index.jsx | 2 +- src/pages/storage/containers/VolumeType/QosSpec/index.jsx | 2 +- .../VolumeType/VolumeType/actions/ManageQos.jsx | 2 +- src/resources/cinder/volume.jsx | 8 ++++---- src/resources/glance/image.jsx | 4 ++-- src/resources/glance/instance-snapshot.js | 4 ++-- src/resources/neutron/network.jsx | 2 +- src/resources/neutron/router.jsx | 2 +- src/resources/neutron/security-group-rule.jsx | 2 +- src/resources/nova/flavor.js | 6 +++--- 43 files changed, 69 insertions(+), 69 deletions(-) diff --git a/docs/en/develop/3-1-BaseList-introduction.md b/docs/en/develop/3-1-BaseList-introduction.md index b6721e69..0ec0e618 100644 --- a/docs/en/develop/3-1-BaseList-introduction.md +++ b/docs/en/develop/3-1-BaseList-introduction.md @@ -204,7 +204,7 @@ English | [Chinese](../../zh/develop/3-1-BaseList-introduction.md) title: t('Use Type'), dataIndex: 'usage_type', isHideable: true, - render: (value) => imageUsage[value] || '-', + render: (value) => imageUsage[value] || value, sorter: false, }, { @@ -218,19 +218,19 @@ English | [Chinese](../../zh/develop/3-1-BaseList-introduction.md) { title: t('Status'), dataIndex: 'status', - render: (value) => imageStatus[value] || '-', + render: (value) => imageStatus[value] || value, }, { title: t('Visibility'), dataIndex: 'visibility', - render: (value) => imageVisibility[value] || '-', + render: (value) => imageVisibility[value] || value, sorter: false, }, { title: t('Disk Format'), dataIndex: 'disk_format', isHideable: true, - render: (value) => imageFormats[value] || '-', + render: (value) => imageFormats[value] || value, }, { title: t('Size'), diff --git a/docs/en/develop/3-3-BaseDetail-introduction.md b/docs/en/develop/3-3-BaseDetail-introduction.md index 9bdf2e40..a9d70c5d 100644 --- a/docs/en/develop/3-3-BaseDetail-introduction.md +++ b/docs/en/develop/3-3-BaseDetail-introduction.md @@ -140,7 +140,7 @@ English | [Chinese](../../zh/develop/3-3-BaseDetail-introduction.md) { title: t('Status'), dataIndex: 'status', - render: (value) => volumeStatus[value] || '-', + render: (value) => volumeStatus[value] || value, }, { title: t('Size'), diff --git a/docs/zh/develop/3-1-BaseList-introduction.md b/docs/zh/develop/3-1-BaseList-introduction.md index c66e7b18..6cbb7064 100644 --- a/docs/zh/develop/3-1-BaseList-introduction.md +++ b/docs/zh/develop/3-1-BaseList-introduction.md @@ -204,7 +204,7 @@ title: t('Use Type'), dataIndex: 'usage_type', isHideable: true, - render: (value) => imageUsage[value] || '-', + render: (value) => imageUsage[value] || value, sorter: false, }, { @@ -218,19 +218,19 @@ { title: t('Status'), dataIndex: 'status', - render: (value) => imageStatus[value] || '-', + render: (value) => imageStatus[value] || value, }, { title: t('Visibility'), dataIndex: 'visibility', - render: (value) => imageVisibility[value] || '-', + render: (value) => imageVisibility[value] || value, sorter: false, }, { title: t('Disk Format'), dataIndex: 'disk_format', isHideable: true, - render: (value) => imageFormats[value] || '-', + render: (value) => imageFormats[value] || value, }, { title: t('Size'), diff --git a/docs/zh/develop/3-3-BaseDetail-introduction.md b/docs/zh/develop/3-3-BaseDetail-introduction.md index 71e99ba1..ec8534f5 100644 --- a/docs/zh/develop/3-3-BaseDetail-introduction.md +++ b/docs/zh/develop/3-3-BaseDetail-introduction.md @@ -140,7 +140,7 @@ { title: t('Status'), dataIndex: 'status', - render: (value) => volumeStatus[value] || '-', + render: (value) => volumeStatus[value] || value, }, { title: t('Size'), diff --git a/src/components/Popover/PopoverNetworks.jsx b/src/components/Popover/PopoverNetworks.jsx index 28248d81..8045453c 100644 --- a/src/components/Popover/PopoverNetworks.jsx +++ b/src/components/Popover/PopoverNetworks.jsx @@ -43,7 +43,7 @@ export default function PopoverNetworks(props) { { title: t('Status'), dataIndex: 'status', - render: (value) => networkStatus[value] || '-', + render: (value) => networkStatus[value] || value, }, ]; return ; diff --git a/src/pages/compute/containers/Flavor/Detail/BaseDetail.jsx b/src/pages/compute/containers/Flavor/Detail/BaseDetail.jsx index ae58f0db..73552cd0 100644 --- a/src/pages/compute/containers/Flavor/Detail/BaseDetail.jsx +++ b/src/pages/compute/containers/Flavor/Detail/BaseDetail.jsx @@ -227,17 +227,17 @@ export class BaseDetail extends Base { { label: t('CPU Policy'), dataIndex: 'hw:cpu_policy', - render: (value) => cpuPolicyList[value] || '-', + render: (value) => cpuPolicyList[value] || value, }, { label: t('CPU Thread Policy'), dataIndex: 'hw:cpu_thread_policy', - render: (value) => cpuThreadPolicyMap[value] || '-', + render: (value) => cpuThreadPolicyMap[value] || value, }, { label: t('Memory Page Size'), dataIndex: 'hw:mem_page_size', - render: (value) => pageTypeMap[value] || '-', + render: (value) => pageTypeMap[value] || value, }, ]; const options = [...numa, ...others]; diff --git a/src/pages/compute/containers/HostAggregate/Aggregate/actions/ManageHost.jsx b/src/pages/compute/containers/HostAggregate/Aggregate/actions/ManageHost.jsx index edd22658..48a5b427 100644 --- a/src/pages/compute/containers/HostAggregate/Aggregate/actions/ManageHost.jsx +++ b/src/pages/compute/containers/HostAggregate/Aggregate/actions/ManageHost.jsx @@ -109,7 +109,7 @@ export class ManageHost extends ModalAction { title: t('Admin Status'), dataIndex: 'status', isHideable: true, - render: (value) => serviceStatus[value] || '-', + render: (value) => serviceStatus[value] || value, tip: (value, record) => { const { disabled_reason } = record || {}; if (disabled_reason) { @@ -122,7 +122,7 @@ export class ManageHost extends ModalAction { title: t('State'), dataIndex: 'state', isHideable: true, - render: (value) => serviceState[value] || '-', + render: (value) => serviceState[value] || value, }, { title: t('Last Updated'), diff --git a/src/pages/compute/containers/Hypervisors/ComputeHost/index.jsx b/src/pages/compute/containers/Hypervisors/ComputeHost/index.jsx index 94a7c126..47bc48b8 100644 --- a/src/pages/compute/containers/Hypervisors/ComputeHost/index.jsx +++ b/src/pages/compute/containers/Hypervisors/ComputeHost/index.jsx @@ -61,7 +61,7 @@ export class ComputeHost extends Base { { title: t('Service Status'), dataIndex: 'status', - render: (value) => serviceStatus[value] || '-', + render: (value) => serviceStatus[value] || value, tip: (value, record) => { const { disabled_reason } = record || {}; if (disabled_reason) { @@ -73,7 +73,7 @@ export class ComputeHost extends Base { { title: t('Service State'), dataIndex: 'state', - render: (value) => serviceState[value] || '-', + render: (value) => serviceState[value] || value, }, { title: t('Last Updated'), diff --git a/src/pages/compute/containers/Image/Detail/BaseDetail.jsx b/src/pages/compute/containers/Image/Detail/BaseDetail.jsx index 7c2a7336..4767d2cd 100644 --- a/src/pages/compute/containers/Image/Detail/BaseDetail.jsx +++ b/src/pages/compute/containers/Image/Detail/BaseDetail.jsx @@ -60,7 +60,7 @@ export class BaseDetail extends Base { { label: t('OS'), dataIndex: 'os_distro', - render: (value) => imageOS[value] || '-', + render: (value) => imageOS[value] || value, }, { label: t('OS Version'), @@ -93,7 +93,7 @@ export class BaseDetail extends Base { { label: t('Visibility'), dataIndex: 'visibility', - render: (value) => imageVisibility[value] || '-', + render: (value) => imageVisibility[value] || value, }, { label: t('Protected'), diff --git a/src/pages/compute/containers/Image/Image.jsx b/src/pages/compute/containers/Image/Image.jsx index 25d49e26..b50b8a46 100644 --- a/src/pages/compute/containers/Image/Image.jsx +++ b/src/pages/compute/containers/Image/Image.jsx @@ -138,7 +138,7 @@ export class Image extends Base { title: t('Use Type'), dataIndex: 'usage_type', isHideable: true, - render: (value) => imageUsage[value] || '-', + render: (value) => imageUsage[value] || value, sorter: false, }, { @@ -152,19 +152,19 @@ export class Image extends Base { { title: t('Status'), dataIndex: 'status', - render: (value) => imageStatus[value] || '-', + render: (value) => imageStatus[value] || value, }, { title: t('Visibility'), dataIndex: 'visibility', - render: (value) => imageVisibility[value] || '-', + render: (value) => imageVisibility[value] || value, sorter: false, }, { title: t('Disk Format'), dataIndex: 'disk_format', isHideable: true, - render: (value) => imageFormats[value] || '-', + render: (value) => imageFormats[value] || value, }, { title: t('Size'), diff --git a/src/pages/compute/containers/Instance/actions/DetachInterface.jsx b/src/pages/compute/containers/Instance/actions/DetachInterface.jsx index f840abfb..503bb59e 100644 --- a/src/pages/compute/containers/Instance/actions/DetachInterface.jsx +++ b/src/pages/compute/containers/Instance/actions/DetachInterface.jsx @@ -118,7 +118,7 @@ export class DetachInterface extends ModalAction { { title: t('State'), dataIndex: 'port_state', - render: (value) => portStatus[value] || '-', + render: (value) => portStatus[value] || value, }, { title: t('Mac Address'), diff --git a/src/pages/compute/containers/Instance/actions/DetachVolume.jsx b/src/pages/compute/containers/Instance/actions/DetachVolume.jsx index fbbf3732..e04f5773 100644 --- a/src/pages/compute/containers/Instance/actions/DetachVolume.jsx +++ b/src/pages/compute/containers/Instance/actions/DetachVolume.jsx @@ -105,7 +105,7 @@ export class DetachVolume extends ModalAction { { title: t('Status'), dataIndex: 'status', - render: (value) => volumeStatus[value] || '-', + render: (value) => volumeStatus[value] || value, }, { title: t('Type'), diff --git a/src/pages/compute/containers/Instance/actions/StepCreate/BaseStep/index.jsx b/src/pages/compute/containers/Instance/actions/StepCreate/BaseStep/index.jsx index a8fd59cb..db31adc5 100644 --- a/src/pages/compute/containers/Instance/actions/StepCreate/BaseStep/index.jsx +++ b/src/pages/compute/containers/Instance/actions/StepCreate/BaseStep/index.jsx @@ -483,7 +483,7 @@ export class BaseStep extends Base { { title: t('Disk Format'), dataIndex: 'disk_format', - render: (value) => imageFormats[value] || '-', + render: (value) => imageFormats[value] || value, }, { title: t('Min System Disk'), @@ -498,7 +498,7 @@ export class BaseStep extends Base { { title: t('Status'), dataIndex: 'status', - render: (value) => imageStatus[value] || '-', + render: (value) => imageStatus[value] || value, }, { title: t('Created At'), @@ -524,7 +524,7 @@ export class BaseStep extends Base { { title: t('Status'), dataIndex: 'status', - render: (value) => volumeStatus[value] || '-', + render: (value) => volumeStatus[value] || value, width: 80, }, { diff --git a/src/pages/compute/containers/Instance/actions/StepCreate/SystemStep/index.jsx b/src/pages/compute/containers/Instance/actions/StepCreate/SystemStep/index.jsx index d31051c9..311fe39a 100644 --- a/src/pages/compute/containers/Instance/actions/StepCreate/SystemStep/index.jsx +++ b/src/pages/compute/containers/Instance/actions/StepCreate/SystemStep/index.jsx @@ -408,7 +408,7 @@ export class SystemStep extends Base { { title: t('Policy'), dataIndex: 'policy', - render: (value) => policyType[value] || '-', + render: (value) => policyType[value] || value, }, ], filterParams: [ diff --git a/src/pages/compute/containers/ServerGroup/Detail/index.jsx b/src/pages/compute/containers/ServerGroup/Detail/index.jsx index b50e7c4d..eabd69b0 100644 --- a/src/pages/compute/containers/ServerGroup/Detail/index.jsx +++ b/src/pages/compute/containers/ServerGroup/Detail/index.jsx @@ -52,7 +52,7 @@ export class ServerGroupDetail extends Base { { title: t('Policy'), dataIndex: 'policy', - render: (value) => policyType[value] || '-', + render: (value) => policyType[value] || value, }, { title: t('Member Count'), diff --git a/src/pages/compute/containers/ServerGroup/index.jsx b/src/pages/compute/containers/ServerGroup/index.jsx index c8d2def2..eac07ef0 100644 --- a/src/pages/compute/containers/ServerGroup/index.jsx +++ b/src/pages/compute/containers/ServerGroup/index.jsx @@ -60,7 +60,7 @@ export class ServerGroup extends Base { { title: t('Policy'), dataIndex: 'policy', - render: (value) => policyType[value] || '-', + render: (value) => policyType[value] || value, }, ]; diff --git a/src/pages/configuration/containers/SystemInfo/CinderService/index.jsx b/src/pages/configuration/containers/SystemInfo/CinderService/index.jsx index fd1403e5..00111770 100644 --- a/src/pages/configuration/containers/SystemInfo/CinderService/index.jsx +++ b/src/pages/configuration/containers/SystemInfo/CinderService/index.jsx @@ -62,7 +62,7 @@ export class CinderService extends Base { { title: t('Service Status'), dataIndex: 'status', - render: (value) => serviceStatus[value] || '-', + render: (value) => serviceStatus[value] || value, tip: (value, record) => { if (value === 'enabled') { return ''; @@ -77,7 +77,7 @@ export class CinderService extends Base { { title: t('Service State'), dataIndex: 'state', - render: (value) => serviceState[value] || '-', + render: (value) => serviceState[value] || value, }, { title: t('Last Updated'), diff --git a/src/pages/configuration/containers/SystemInfo/ComputeService/index.jsx b/src/pages/configuration/containers/SystemInfo/ComputeService/index.jsx index f1fbec9b..aa08c1bf 100644 --- a/src/pages/configuration/containers/SystemInfo/ComputeService/index.jsx +++ b/src/pages/configuration/containers/SystemInfo/ComputeService/index.jsx @@ -62,7 +62,7 @@ export class ComputeService extends Base { { title: t('Service Status'), dataIndex: 'status', - render: (value) => serviceStatus[value] || '-', + render: (value) => serviceStatus[value] || value, tip: (value, record) => { const { disabled_reason } = record || {}; if (disabled_reason) { @@ -74,7 +74,7 @@ export class ComputeService extends Base { { title: t('Service State'), dataIndex: 'state', - render: (value) => serviceState[value] || '-', + render: (value) => serviceState[value] || value, }, { title: t('Last Updated'), diff --git a/src/pages/configuration/containers/SystemInfo/HeatService.jsx b/src/pages/configuration/containers/SystemInfo/HeatService.jsx index 04218a9f..8d86adab 100644 --- a/src/pages/configuration/containers/SystemInfo/HeatService.jsx +++ b/src/pages/configuration/containers/SystemInfo/HeatService.jsx @@ -57,7 +57,7 @@ export class HeatService extends Base { { title: t('Status'), dataIndex: 'status', - render: (value) => serviceState[value] || '-', + render: (value) => serviceState[value] || value, }, { title: t('Last Updated'), diff --git a/src/pages/network/containers/FloatingIp/index.jsx b/src/pages/network/containers/FloatingIp/index.jsx index 4dcbb059..1ecaf4df 100644 --- a/src/pages/network/containers/FloatingIp/index.jsx +++ b/src/pages/network/containers/FloatingIp/index.jsx @@ -258,7 +258,7 @@ export class FloatingIps extends Base { { title: t('Status'), dataIndex: 'status', - render: (value) => floatingIpStatus[value] || '-', + render: (value) => floatingIpStatus[value] || value, }, { title: t('Created At'), diff --git a/src/pages/network/containers/Network/Detail/Subnets.jsx b/src/pages/network/containers/Network/Detail/Subnets.jsx index 9dfe8bf8..d6cbd275 100644 --- a/src/pages/network/containers/Network/Detail/Subnets.jsx +++ b/src/pages/network/containers/Network/Detail/Subnets.jsx @@ -115,7 +115,7 @@ export class Subnets extends Base { { // title: t('Status'), // dataIndex: 'status', - // render: value => networkStatus[value] || '-', + // render: value => networkStatus[value] || value, // isHideable: true, // }, { title: t('Created At'), diff --git a/src/pages/network/containers/Router/Port/Detail/BaseDetail.jsx b/src/pages/network/containers/Router/Port/Detail/BaseDetail.jsx index 47470f66..7d51b917 100644 --- a/src/pages/network/containers/Router/Port/Detail/BaseDetail.jsx +++ b/src/pages/network/containers/Router/Port/Detail/BaseDetail.jsx @@ -146,7 +146,7 @@ export class BaseDetail extends Base { { label: t('VNIC Type'), dataIndex: 'binding__vnic_type', - render: (value) => bindingTypes[value] || '-', + render: (value) => bindingTypes[value] || value, }, ]; if (this.detailData.binding__host_id) { diff --git a/src/pages/network/containers/Router/Port/index.jsx b/src/pages/network/containers/Router/Port/index.jsx index 9f67056a..ce253960 100644 --- a/src/pages/network/containers/Router/Port/index.jsx +++ b/src/pages/network/containers/Router/Port/index.jsx @@ -89,7 +89,7 @@ export class Ports extends Base { { title: t('Status'), dataIndex: 'status', - render: (value) => portStatus[value] || '-', + render: (value) => portStatus[value] || value, }, { title: t('Created At'), diff --git a/src/pages/network/containers/Router/actions/Create.jsx b/src/pages/network/containers/Router/actions/Create.jsx index d0ae17b4..af729cb4 100644 --- a/src/pages/network/containers/Router/actions/Create.jsx +++ b/src/pages/network/containers/Router/actions/Create.jsx @@ -181,7 +181,7 @@ export class Create extends ModalAction { { title: t('State'), dataIndex: 'state', - render: (value) => availabilityZoneState[value] || '-', + render: (value) => availabilityZoneState[value] || value, }, { title: t('Resource Type'), @@ -218,7 +218,7 @@ export class Create extends ModalAction { { title: t('Status'), dataIndex: 'status', - render: (value) => networkStatus[value] || '-', + render: (value) => networkStatus[value] || value, }, { title: t('Created At'), diff --git a/src/pages/network/containers/Router/actions/SetGateway.jsx b/src/pages/network/containers/Router/actions/SetGateway.jsx index cb781c7b..9bbbf204 100644 --- a/src/pages/network/containers/Router/actions/SetGateway.jsx +++ b/src/pages/network/containers/Router/actions/SetGateway.jsx @@ -73,7 +73,7 @@ export class SetGateway extends ModalAction { { title: t('Status'), dataIndex: 'status', - render: (value) => networkStatus[value] || '-', + render: (value) => networkStatus[value] || value, }, { title: t('Created At'), diff --git a/src/pages/network/containers/Topology/NodeCard.jsx b/src/pages/network/containers/Topology/NodeCard.jsx index ab534bc6..deac67b6 100644 --- a/src/pages/network/containers/Topology/NodeCard.jsx +++ b/src/pages/network/containers/Topology/NodeCard.jsx @@ -67,7 +67,7 @@ export default class NodeCard extends React.Component { { title: t('Status'), dataIndex: 'status', - render: (value) => routerStatus[value] || '-', + render: (value) => routerStatus[value] || value, }, { title: t('External Fixed IP'), diff --git a/src/pages/network/containers/VirtualAdapter/Detail/BaseDetail/index.jsx b/src/pages/network/containers/VirtualAdapter/Detail/BaseDetail/index.jsx index 6f46c49a..856e97ff 100644 --- a/src/pages/network/containers/VirtualAdapter/Detail/BaseDetail/index.jsx +++ b/src/pages/network/containers/VirtualAdapter/Detail/BaseDetail/index.jsx @@ -57,7 +57,7 @@ export class BaseDetail extends Base { { label: t('VNIC Type'), dataIndex: 'binding:vnic_type', - render: (value) => bindingTypes[value] || '-', + render: (value) => bindingTypes[value] || value, }, ]; if (this.qosEndpoint) { diff --git a/src/pages/storage/containers/Backup/Detail/index.jsx b/src/pages/storage/containers/Backup/Detail/index.jsx index 2b68c957..30e98856 100644 --- a/src/pages/storage/containers/Backup/Detail/index.jsx +++ b/src/pages/storage/containers/Backup/Detail/index.jsx @@ -66,7 +66,7 @@ export class Detail extends Base { { title: t('Status'), dataIndex: 'status', - render: (value) => backupStatus[value] || '-', + render: (value) => backupStatus[value] || value, }, { title: t('Project ID'), diff --git a/src/pages/storage/containers/Backup/index.jsx b/src/pages/storage/containers/Backup/index.jsx index c652678d..bc2ce729 100644 --- a/src/pages/storage/containers/Backup/index.jsx +++ b/src/pages/storage/containers/Backup/index.jsx @@ -105,7 +105,7 @@ export class Backup extends Base { title: t('Status'), dataIndex: 'status', isHideable: true, - render: (value) => backupStatus[value] || '-', + render: (value) => backupStatus[value] || value, }, { title: t('Created At'), diff --git a/src/pages/storage/containers/Snapshot/index.jsx b/src/pages/storage/containers/Snapshot/index.jsx index f06ed156..eacc8748 100644 --- a/src/pages/storage/containers/Snapshot/index.jsx +++ b/src/pages/storage/containers/Snapshot/index.jsx @@ -112,7 +112,7 @@ export class Snapshots extends Base { { title: t('Status'), dataIndex: 'status', - render: (value) => volumeStatus[value] || '-', + render: (value) => volumeStatus[value] || value, }, { title: t('Volume ID/Name'), diff --git a/src/pages/storage/containers/Volume/Detail/index.jsx b/src/pages/storage/containers/Volume/Detail/index.jsx index d6c383f8..e01ac2b8 100644 --- a/src/pages/storage/containers/Volume/Detail/index.jsx +++ b/src/pages/storage/containers/Volume/Detail/index.jsx @@ -63,7 +63,7 @@ export class VolumeDetail extends Base { { title: t('Status'), dataIndex: 'status', - render: (value) => volumeStatus[value] || '-', + render: (value) => volumeStatus[value] || value, }, { title: t('Size'), diff --git a/src/pages/storage/containers/Volume/actions/Create/index.jsx b/src/pages/storage/containers/Volume/actions/Create/index.jsx index f3629b82..ba79ffb0 100644 --- a/src/pages/storage/containers/Volume/actions/Create/index.jsx +++ b/src/pages/storage/containers/Volume/actions/Create/index.jsx @@ -468,7 +468,7 @@ export class Create extends FormAction { { title: t('Status'), dataIndex: 'status', - render: (value) => volumeStatus[value] || '-', + render: (value) => volumeStatus[value] || value, }, { title: t('Description'), diff --git a/src/pages/storage/containers/Volume/actions/Restore.jsx b/src/pages/storage/containers/Volume/actions/Restore.jsx index 75779e32..8af97e31 100644 --- a/src/pages/storage/containers/Volume/actions/Restore.jsx +++ b/src/pages/storage/containers/Volume/actions/Restore.jsx @@ -84,7 +84,7 @@ export class RestoreAction extends ModalAction { { title: t('Status'), dataIndex: 'status', - render: (value) => volumeStatus[value] || '-', + render: (value) => volumeStatus[value] || value, }, { title: t('Created At'), diff --git a/src/pages/storage/containers/VolumeType/QosSpec/Detail/index.jsx b/src/pages/storage/containers/VolumeType/QosSpec/Detail/index.jsx index 3981d863..977a4067 100644 --- a/src/pages/storage/containers/VolumeType/QosSpec/Detail/index.jsx +++ b/src/pages/storage/containers/VolumeType/QosSpec/Detail/index.jsx @@ -49,7 +49,7 @@ export class Detail extends Base { { title: t('Consumer'), dataIndex: 'consumer', - render: (value) => consumerTypes[value] || '-', + render: (value) => consumerTypes[value] || value, }, ]; } diff --git a/src/pages/storage/containers/VolumeType/QosSpec/index.jsx b/src/pages/storage/containers/VolumeType/QosSpec/index.jsx index a5cdb241..980fe38e 100644 --- a/src/pages/storage/containers/VolumeType/QosSpec/index.jsx +++ b/src/pages/storage/containers/VolumeType/QosSpec/index.jsx @@ -50,7 +50,7 @@ export class QosSpecs extends Base { title: t('Consumer'), dataIndex: 'consumer', isHideable: true, - render: (value) => consumerTypes[value] || '-', + render: (value) => consumerTypes[value] || value, }, { title: t('Specs'), diff --git a/src/pages/storage/containers/VolumeType/VolumeType/actions/ManageQos.jsx b/src/pages/storage/containers/VolumeType/VolumeType/actions/ManageQos.jsx index 30d2a7ec..a6d18ece 100644 --- a/src/pages/storage/containers/VolumeType/VolumeType/actions/ManageQos.jsx +++ b/src/pages/storage/containers/VolumeType/VolumeType/actions/ManageQos.jsx @@ -93,7 +93,7 @@ export class ManageQos extends ModalAction { { title: t('Consumer'), dataIndex: 'consumer', - render: (value) => consumerTypes[value] || '-', + render: (value) => consumerTypes[value] || value, }, { title: t('Specs'), diff --git a/src/resources/cinder/volume.jsx b/src/resources/cinder/volume.jsx index e17ab377..c1d158a9 100644 --- a/src/resources/cinder/volume.jsx +++ b/src/resources/cinder/volume.jsx @@ -167,7 +167,7 @@ export const volumeColumns = [ { title: t('Status'), dataIndex: 'status', - render: (value) => volumeStatus[value] || '-', + render: (value) => volumeStatus[value] || value, }, { title: t('Shared'), @@ -277,7 +277,7 @@ export const getVolumeColumnsList = (self) => { { title: t('Status'), dataIndex: 'status', - render: (value) => volumeStatus[value] || '-', + render: (value) => volumeStatus[value] || value, }, { title: t('Type'), @@ -290,7 +290,7 @@ export const getVolumeColumnsList = (self) => { title: t('Disk Tag'), dataIndex: 'disk_tag', isHideable: true, - render: (value) => diskTag[value] || '-', + render: (value) => diskTag[value] || value, sorter: false, }, { @@ -330,7 +330,7 @@ export const getVolumeColumnsList = (self) => { ), dataIndex: 'bootable', isHideable: true, - render: (value) => bootableType[value] || '-', + render: (value) => bootableType[value] || value, }, { title: t('Shared'), diff --git a/src/resources/glance/image.jsx b/src/resources/glance/image.jsx index 8a65d0ac..a806d0a2 100644 --- a/src/resources/glance/image.jsx +++ b/src/resources/glance/image.jsx @@ -208,12 +208,12 @@ export const getImageColumns = (self) => [ { title: t('Access Control'), dataIndex: 'visibility', - render: (value) => imageVisibility[value] || '-', + render: (value) => imageVisibility[value] || value, }, { title: t('Format'), dataIndex: 'disk_format', - render: (value) => imageFormats[value] || '-', + render: (value) => imageFormats[value] || value, }, { title: t('Image Size'), diff --git a/src/resources/glance/instance-snapshot.js b/src/resources/glance/instance-snapshot.js index 3b0c677d..aa6b9766 100644 --- a/src/resources/glance/instance-snapshot.js +++ b/src/resources/glance/instance-snapshot.js @@ -37,12 +37,12 @@ export const getBaseSnapshotColumns = (self) => [ title: t('Disk Format'), dataIndex: 'disk_format', isHideable: true, - render: (value) => imageFormats[value] || '-', + render: (value) => imageFormats[value] || value, }, { title: t('Status'), dataIndex: 'status', - render: (value) => imageStatus[value] || '-', + render: (value) => imageStatus[value] || value, }, { title: t('Created At'), diff --git a/src/resources/neutron/network.jsx b/src/resources/neutron/network.jsx index 21ff1756..89aab161 100644 --- a/src/resources/neutron/network.jsx +++ b/src/resources/neutron/network.jsx @@ -55,7 +55,7 @@ export const networkColumns = (self) => [ { title: t('Status'), dataIndex: 'status', - render: (value) => networkStatus[value] || '-', + render: (value) => networkStatus[value] || value, }, { title: t('Subnet Count'), diff --git a/src/resources/neutron/router.jsx b/src/resources/neutron/router.jsx index 4eed1a32..c0ee3670 100644 --- a/src/resources/neutron/router.jsx +++ b/src/resources/neutron/router.jsx @@ -48,7 +48,7 @@ export const getRouterColumns = (self) => [ { title: t('Status'), dataIndex: 'status', - render: (value) => routerStatus[value] || '-', + render: (value) => routerStatus[value] || value, }, { title: t('Open External Gateway'), diff --git a/src/resources/neutron/security-group-rule.jsx b/src/resources/neutron/security-group-rule.jsx index c2ca2e9d..52435807 100644 --- a/src/resources/neutron/security-group-rule.jsx +++ b/src/resources/neutron/security-group-rule.jsx @@ -59,7 +59,7 @@ export const getSelfColumns = (self) => [ { title: t('Direction'), dataIndex: 'direction', - render: (value) => directions[value] || '-', + render: (value) => directions[value] || value, }, { title: t('Ether Type'), diff --git a/src/resources/nova/flavor.js b/src/resources/nova/flavor.js index a3f5c7f8..9b3d2cbb 100644 --- a/src/resources/nova/flavor.js +++ b/src/resources/nova/flavor.js @@ -224,19 +224,19 @@ export const gpuColumns = [ title: t('CPU Policy'), dataIndex: 'hw:cpu_policy', isHideable: true, - render: (value) => cpuPolicyList[value] || '-', + render: (value) => cpuPolicyList[value] || value, }, { title: t('CPU Thread Policy'), dataIndex: 'hw:cpu_thread_policy', isHideable: true, - render: (value) => cpuThreadPolicyMap[value] || '-', + render: (value) => cpuThreadPolicyMap[value] || value, }, { title: t('Memory Page'), dataIndex: 'hw:mem_page_size', isHideable: true, - render: (value) => pageTypeMap[value] || '-', + render: (value) => pageTypeMap[value] || value, }, ];