Merge "fix: fix the data showing if not matched"

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'),

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'),

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'),

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'),

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 <IPopover columns={columns} getRequests={getRequests} />;

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];

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'),

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'),

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'),

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'),

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'),

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'),

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,
       },
       {

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: [

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'),

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,
     },
   ];
 

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'),

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'),

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'),

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'),

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'),

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) {

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'),

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'),

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'),

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'),

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) {

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'),

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'),

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'),

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'),

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'),

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'),

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,
       },
     ];
   }

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'),

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'),

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'),

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'),

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'),

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'),

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'),

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'),

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,
   },
 ];