diff --git a/src/apps/admin/src/billing-account/BillingAccountsPage/BillingAccountsPage.tsx b/src/apps/admin/src/billing-account/BillingAccountsPage/BillingAccountsPage.tsx index 13d299563..8bf8e956b 100644 --- a/src/apps/admin/src/billing-account/BillingAccountsPage/BillingAccountsPage.tsx +++ b/src/apps/admin/src/billing-account/BillingAccountsPage/BillingAccountsPage.tsx @@ -1,11 +1,11 @@ /** * Billing accounts page. */ -import { FC } from 'react' +import { FC, useState } from 'react' import classNames from 'classnames' import { PlusIcon } from '@heroicons/react/solid' -import { LinkButton, LoadingSpinner, PageDivider, PageTitle } from '~/libs/ui' +import { colWidthType, LinkButton, LoadingSpinner, PageDivider, PageTitle } from '~/libs/ui' import { BillingAccountsFilter } from '../../lib/components/BillingAccountsFilter' import { BillingAccountsTable } from '../../lib/components/BillingAccountsTable' @@ -22,6 +22,7 @@ interface Props { const pageTitle = 'Billing Accounts' export const BillingAccountsPage: FC = (props: Props) => { + const [colWidth, setColWidth] = useState({}) const { isLoading, datas, @@ -76,6 +77,8 @@ export const BillingAccountsPage: FC = (props: Props) => { setPage={setPage} setSort={setSort} sort={sort} + colWidth={colWidth} + setColWidth={setColWidth} /> )} diff --git a/src/apps/admin/src/billing-account/ClientsPage/ClientsPage.tsx b/src/apps/admin/src/billing-account/ClientsPage/ClientsPage.tsx index ee2e97010..ceb44fc8f 100644 --- a/src/apps/admin/src/billing-account/ClientsPage/ClientsPage.tsx +++ b/src/apps/admin/src/billing-account/ClientsPage/ClientsPage.tsx @@ -1,10 +1,10 @@ /** * Billing account clients page. */ -import { FC } from 'react' +import { FC, useState } from 'react' import classNames from 'classnames' -import { LinkButton, LoadingSpinner, PageDivider, PageTitle } from '~/libs/ui' +import { colWidthType, LinkButton, LoadingSpinner, PageDivider, PageTitle } from '~/libs/ui' import { PlusIcon } from '@heroicons/react/solid' import { MSG_NO_RECORD_FOUND } from '../../config/index.config' @@ -22,6 +22,7 @@ interface Props { const pageTitle = 'Clients' export const ClientsPage: FC = (props: Props) => { + const [colWidth, setColWidth] = useState({}) const { isLoading, datas, @@ -77,6 +78,8 @@ export const ClientsPage: FC = (props: Props) => { setPage={setPage} setSort={setSort} sort={sort} + colWidth={colWidth} + setColWidth={setColWidth} /> )} diff --git a/src/apps/admin/src/lib/components/BillingAccountResourcesTable/BillingAccountResourcesTable.module.scss b/src/apps/admin/src/lib/components/BillingAccountResourcesTable/BillingAccountResourcesTable.module.scss index cf03543d0..6e7d98479 100644 --- a/src/apps/admin/src/lib/components/BillingAccountResourcesTable/BillingAccountResourcesTable.module.scss +++ b/src/apps/admin/src/lib/components/BillingAccountResourcesTable/BillingAccountResourcesTable.module.scss @@ -21,3 +21,9 @@ .btnDelete { padding-right: 0; } + +.desktopTable { + td { + vertical-align: middle; + } +} diff --git a/src/apps/admin/src/lib/components/BillingAccountResourcesTable/BillingAccountResourcesTable.tsx b/src/apps/admin/src/lib/components/BillingAccountResourcesTable/BillingAccountResourcesTable.tsx index 70e241c12..69eee47f7 100644 --- a/src/apps/admin/src/lib/components/BillingAccountResourcesTable/BillingAccountResourcesTable.tsx +++ b/src/apps/admin/src/lib/components/BillingAccountResourcesTable/BillingAccountResourcesTable.tsx @@ -1,11 +1,11 @@ /** * Billing account resources table. */ -import { FC, useMemo } from 'react' +import { FC, useMemo, useState } from 'react' import classNames from 'classnames' import { useWindowSize, WindowSize } from '~/libs/shared' -import { Button, Table, TableColumn } from '~/libs/ui' +import { Button, colWidthType, Table, TableColumn } from '~/libs/ui' import { useTableFilterLocal, useTableFilterLocalProps } from '../../hooks' import { Pagination } from '../common/Pagination' @@ -26,6 +26,7 @@ interface Props { } export const BillingAccountResourcesTable: FC = (props: Props) => { + const [colWidth, setColWidth] = useState({}) const { page, setPage, @@ -40,12 +41,14 @@ export const BillingAccountResourcesTable: FC = (props: Props) => { const columns = useMemo[]>( () => [ { + columnId: 'name', label: 'Name', propertyName: 'name', type: 'text', }, { className: styles.blockColumnAction, + columnId: 'action', label: '', renderer: (data: BillingAccountResource) => (