fix(listview): use disableSortBy to disable sorting in table columns (#10223)

This commit is contained in:
ʈᵃᵢ 2020-07-02 10:00:37 -07:00 committed by GitHub
parent 316de3ae70
commit 0afa15138b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 14 deletions

View File

@ -119,7 +119,6 @@ class ChartList extends React.PureComponent<Props, State> {
}: any) => <a href={url}>{sliceName}</a>,
Header: t('Chart'),
accessor: 'slice_name',
canSort: true,
},
{
Cell: ({
@ -129,7 +128,6 @@ class ChartList extends React.PureComponent<Props, State> {
}: any) => vizType,
Header: t('Visualization Type'),
accessor: 'viz_type',
canSort: true,
},
{
Cell: ({
@ -139,7 +137,6 @@ class ChartList extends React.PureComponent<Props, State> {
}: any) => <a href={dsUrl}>{dsNameTxt}</a>,
Header: t('Datasource'),
accessor: 'datasource_name',
canSort: true,
},
{
Cell: ({
@ -152,7 +149,6 @@ class ChartList extends React.PureComponent<Props, State> {
}: any) => <a href={changedByUrl}>{changedByName}</a>,
Header: t('Creator'),
accessor: 'changed_by_fk',
canSort: true,
},
{
Cell: ({
@ -162,19 +158,21 @@ class ChartList extends React.PureComponent<Props, State> {
}: any) => <span className="no-wrap">{moment(changedOn).fromNow()}</span>,
Header: t('Last Modified'),
accessor: 'changed_on',
canSort: true,
},
{
accessor: 'description',
hidden: true,
disableSortBy: true,
},
{
accessor: 'owners',
hidden: true,
disableSortBy: true,
},
{
accessor: 'datasource',
hidden: true,
disableSortBy: true,
},
{
Cell: ({ row: { state, original } }: any) => {
@ -226,6 +224,7 @@ class ChartList extends React.PureComponent<Props, State> {
},
Header: t('Actions'),
id: 'actions',
disableSortBy: true,
},
];

View File

@ -134,7 +134,6 @@ class DashboardList extends React.PureComponent<Props, State> {
}: any) => <a href={url}>{dashboardTitle}</a>,
Header: t('Title'),
accessor: 'dashboard_title',
sortable: true,
},
{
Cell: ({
@ -152,6 +151,7 @@ class DashboardList extends React.PureComponent<Props, State> {
),
Header: t('Owners'),
accessor: 'owners',
disableSortBy: true,
},
{
Cell: ({
@ -164,7 +164,6 @@ class DashboardList extends React.PureComponent<Props, State> {
}: any) => <a href={changedByUrl}>{changedByName}</a>,
Header: t('Creator'),
accessor: 'changed_by_fk',
sortable: true,
},
{
Cell: ({
@ -178,7 +177,6 @@ class DashboardList extends React.PureComponent<Props, State> {
),
Header: t('Published'),
accessor: 'published',
sortable: true,
},
{
Cell: ({
@ -188,11 +186,11 @@ class DashboardList extends React.PureComponent<Props, State> {
}: any) => <span className="no-wrap">{moment(changedOn).fromNow()}</span>,
Header: t('Modified'),
accessor: 'changed_on',
sortable: true,
},
{
accessor: 'slug',
hidden: true,
disableSortBy: true,
},
{
Cell: ({ row: { state, original } }: any) => {
@ -254,6 +252,7 @@ class DashboardList extends React.PureComponent<Props, State> {
},
Header: t('Actions'),
id: 'actions',
disableSortBy: true,
},
];

View File

@ -176,6 +176,7 @@ class DatasetList extends React.PureComponent<Props, State> {
);
},
accessor: 'kind_icon',
disableSortBy: true,
size: 'xs',
},
{
@ -186,7 +187,6 @@ class DatasetList extends React.PureComponent<Props, State> {
}: any) => datasetTitle,
Header: t('Name'),
accessor: 'table_name',
sortable: true,
},
{
Cell: ({
@ -196,16 +196,19 @@ class DatasetList extends React.PureComponent<Props, State> {
}: any) => kind[0]?.toUpperCase() + kind.slice(1),
Header: t('Type'),
accessor: 'kind',
disableSortBy: true,
size: 'md',
},
{
Header: t('Source'),
accessor: 'database_name',
disableSortBy: true,
size: 'lg',
},
{
Header: t('Schema'),
accessor: 'schema',
disableSortBy: true,
size: 'lg',
},
{
@ -229,7 +232,6 @@ class DatasetList extends React.PureComponent<Props, State> {
},
Header: t('Last Modified'),
accessor: 'changed_on',
sortable: true,
size: 'xl',
},
{
@ -240,10 +242,12 @@ class DatasetList extends React.PureComponent<Props, State> {
}: any) => changedByName,
Header: t('Modified By'),
accessor: 'changed_by_fk',
disableSortBy: true,
size: 'xl',
},
{
accessor: 'database',
disableSortBy: true,
hidden: true,
},
{
@ -271,11 +275,13 @@ class DatasetList extends React.PureComponent<Props, State> {
},
Header: t('Owners'),
id: 'owners',
disableSortBy: true,
size: 'lg',
},
{
accessor: 'is_sqllab_view',
hidden: true,
disableSortBy: true,
},
{
Cell: ({ row: { state, original } }: any) => {
@ -352,6 +358,7 @@ class DatasetList extends React.PureComponent<Props, State> {
},
Header: t('Actions'),
id: 'actions',
disableSortBy: true,
},
];

View File

@ -54,7 +54,6 @@ class DashboardTable extends React.PureComponent {
{
accessor: 'dashboard_title',
Header: 'Dashboard',
canSort: true,
Cell: ({
row: {
original: { url, dashboard_title: dashboardTitle },
@ -64,7 +63,6 @@ class DashboardTable extends React.PureComponent {
{
accessor: 'changed_by_fk',
Header: 'Creator',
canSort: true,
Cell: ({
row: {
original: { changed_by_name: changedByName, changedByUrl },
@ -74,7 +72,6 @@ class DashboardTable extends React.PureComponent {
{
accessor: 'changed_on',
Header: 'Modified',
canSort: true,
Cell: ({
row: {
original: { changed_on: changedOn },