Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Revert "refactor: Remove usages of reactable from TimeTable" #11150

Merged
merged 1 commit into from
Oct 3, 2020
Merged

fix: Revert "refactor: Remove usages of reactable from TimeTable" #11150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 20 additions & 40 deletions superset-frontend/src/components/ListView/ListView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
* under the License.
*/
import { t, styled } from '@superset-ui/core';
import { css } from '@emotion/core';
import React, { useState } from 'react';
import { Alert } from 'react-bootstrap';
import { Empty } from 'src/common/components';
Expand All @@ -38,11 +37,7 @@ import {
} from './types';
import { ListViewError, useListViewState } from './utils';

interface ListViewStylesProps {
fullHeight: boolean;
}

const ListViewStyles = styled.div<ListViewStylesProps>`
const ListViewStyles = styled.div`
text-align: center;

.superset-list-view {
Expand All @@ -53,12 +48,8 @@ const ListViewStyles = styled.div<ListViewStylesProps>`
padding-bottom: 48px;

.body {
${({ fullHeight }) =>
!fullHeight &&
css`
overflow: scroll;
max-height: 64vh;
`};
overflow: scroll;
max-height: 64vh;
}
}

Expand Down Expand Up @@ -211,9 +202,6 @@ export interface ListViewProps<T extends object = any> {
renderCard?: (row: T & { loading: boolean }) => React.ReactNode;
cardSortSelectOptions?: Array<CardSortSelectOption>;
defaultViewMode?: ViewModeType;
sticky?: boolean;
fullHeight?: boolean;
manualSortBy?: boolean;
}

function ListView<T extends object = any>({
Expand All @@ -233,9 +221,6 @@ function ListView<T extends object = any>({
renderCard,
cardSortSelectOptions,
defaultViewMode = 'card',
sticky = true,
fullHeight = false,
manualSortBy = true,
}: ListViewProps<T>) {
const {
getTableProps,
Expand All @@ -259,10 +244,8 @@ function ListView<T extends object = any>({
initialPageSize,
initialSort,
initialFilters: filters,
manualSortBy,
});
const filterable = Boolean(filters.length);
const withPagination = Boolean(count);
if (filterable) {
const columnAccessors = columns.reduce(
(acc, col) => ({ ...acc, [col.accessor || col.id]: true }),
Expand All @@ -283,7 +266,7 @@ function ListView<T extends object = any>({
);

return (
<ListViewStyles fullHeight={fullHeight}>
<ListViewStyles>
<div className={`superset-list-view ${className}`}>
<div className="header">
{cardViewEnabled && (
Expand Down Expand Up @@ -367,7 +350,6 @@ function ListView<T extends object = any>({
rows={rows}
columns={columns}
loading={loading}
sticky={sticky}
/>
)}
{!loading && rows.length === 0 && (
Expand All @@ -378,25 +360,23 @@ function ListView<T extends object = any>({
</div>
</div>

{withPagination && (
<div className="pagination-container">
<Pagination
totalPages={pageCount || 0}
currentPage={pageCount ? pageIndex + 1 : 0}
onChange={(p: number) => gotoPage(p - 1)}
hideFirstAndLastPageLinks
/>
<div className="row-count-container">
{!loading &&
t(
'%s-%s of %s',
pageSize * pageIndex + (rows.length && 1),
pageSize * pageIndex + rows.length,
count,
)}
</div>
<div className="pagination-container">
<Pagination
totalPages={pageCount || 0}
currentPage={pageCount ? pageIndex + 1 : 0}
onChange={(p: number) => gotoPage(p - 1)}
hideFirstAndLastPageLinks
/>
<div className="row-count-container">
{!loading &&
t(
'%s-%s of %s',
pageSize * pageIndex + (rows.length && 1),
pageSize * pageIndex + rows.length,
count,
)}
</div>
)}
</div>
</ListViewStyles>
);
}
Expand Down
12 changes: 3 additions & 9 deletions superset-frontend/src/components/ListView/TableCollection.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,19 +30,14 @@ interface TableCollectionProps {
rows: TableInstance['rows'];
columns: TableInstance['column'][];
loading: boolean;
sticky: boolean;
}

interface TableProps {
sticky: boolean;
}

const Table = styled.table<TableProps>`
const Table = styled.table`
border-collapse: separate;

th {
background: ${({ theme }) => theme.colors.grayscale.light5};
position: ${({ sticky }) => sticky && 'sticky'};
position: sticky;
top: 0;

&:first-of-type {
Expand Down Expand Up @@ -204,10 +199,9 @@ export default function TableCollection({
columns,
rows,
loading,
sticky,
}: TableCollectionProps) {
return (
<Table {...getTableProps()} sticky={sticky} className="table table-hover">
<Table {...getTableProps()} className="table table-hover">
<thead>
{headerGroups.map(headerGroup => (
<tr {...headerGroup.getHeaderGroupProps()}>
Expand Down
4 changes: 1 addition & 3 deletions superset-frontend/src/components/ListView/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,6 @@ interface UseListViewConfig {
Header: (conf: any) => React.ReactNode;
Cell: (conf: any) => React.ReactNode;
};
manualSortBy: boolean;
}

export function useListViewState({
Expand All @@ -123,7 +122,6 @@ export function useListViewState({
initialSort = [],
bulkSelectMode = false,
bulkSelectColumnConfig,
manualSortBy,
}: UseListViewConfig) {
const [query, setQuery] = useQueryParams({
filters: JsonParam,
Expand Down Expand Up @@ -179,9 +177,9 @@ export function useListViewState({
initialState,
manualFilters: true,
manualPagination: true,
manualSortBy: true,
autoResetFilters: false,
pageCount: Math.ceil(count / initialPageSize),
manualSortBy,
},
useFilters,
useSortBy,
Expand Down
Loading