diff --git a/src/pages/database/containers/Instances/index.jsx b/src/pages/database/containers/Instances/index.jsx index 0c545df5..12d573ed 100644 --- a/src/pages/database/containers/Instances/index.jsx +++ b/src/pages/database/containers/Instances/index.jsx @@ -17,6 +17,7 @@ import { observer, inject } from 'mobx-react'; import Base from 'containers/List'; import globalInstancesStore from 'stores/trove/instances'; import { InstanceStatus } from 'resources/trove/database'; +import { getOptions } from 'utils/index'; import actions from './actions'; export class Instances extends Base { @@ -49,58 +50,69 @@ export class Instances extends Base { label: t('Name'), name: 'name', }, + { + label: t('Version'), + name: 'version', + }, + { + label: t('Status'), + name: 'status', + options: getOptions(InstanceStatus), + }, ]; } - getColumns = () => [ - { - title: t('ID/Name'), - dataIndex: 'name', - routeName: this.getRouteName('databaseInstanceDetail'), - }, - { - title: t('Project ID/Name'), - dataIndex: 'project_name', - isHideable: true, - hidden: !this.isAdminPage, - }, - { - title: t('Datastore'), - dataIndex: 'type', - }, - { - title: t('Datastore Version'), - dataIndex: 'version', - isHideable: true, - }, - { - title: t('Host'), - dataIndex: 'ip', - render: (value) => { - return value && value.length ? ( - <> - {value.map((it) => ( -