Updated SortableBarGraph to be a functional component

This commit is contained in:
Alejandro Celaya 2020-05-31 11:36:56 +02:00
parent 11f9c7c507
commit 1b60b0e2a8

View file

@ -1,4 +1,4 @@
import React from 'react'; import React, { useState } from 'react';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import { fromPairs, head, keys, pipe, prop, reverse, sortBy, splitEvery, toLower, toPairs, type, zipObj } from 'ramda'; import { fromPairs, head, keys, pipe, prop, reverse, sortBy, splitEvery, toLower, toPairs, type, zipObj } from 'ramda';
import SortingDropdown from '../utils/SortingDropdown'; import SortingDropdown from '../utils/SortingDropdown';
@ -8,13 +8,7 @@ import { roundTen } from '../utils/helpers/numbers';
import SimplePaginator from '../common/SimplePaginator'; import SimplePaginator from '../common/SimplePaginator';
import GraphCard from './GraphCard'; import GraphCard from './GraphCard';
const { max } = Math; const propTypes = {
const toLowerIfString = (value) => type(value) === 'String' ? toLower(value) : value;
const pickKeyFromPair = ([ key ]) => key;
const pickValueFromPair = ([ , value ]) => value;
export default class SortableBarGraph extends React.Component {
static propTypes = {
stats: PropTypes.object.isRequired, stats: PropTypes.object.isRequired,
highlightedStats: PropTypes.object, highlightedStats: PropTypes.object,
highlightedLabel: PropTypes.string, highlightedLabel: PropTypes.string,
@ -23,58 +17,69 @@ export default class SortableBarGraph extends React.Component {
extraHeaderContent: PropTypes.func, extraHeaderContent: PropTypes.func,
withPagination: PropTypes.bool, withPagination: PropTypes.bool,
onClick: PropTypes.func, onClick: PropTypes.func,
}; };
state = { const toLowerIfString = (value) => type(value) === 'String' ? toLower(value) : value;
const pickKeyFromPair = ([ key ]) => key;
const pickValueFromPair = ([ , value ]) => value;
const SortableBarGraph = ({
stats,
highlightedStats,
title,
sortingItems,
extraHeaderContent,
withPagination = true,
...rest
}) => {
const [ order, setOrder ] = useState({
orderField: undefined, orderField: undefined,
orderDir: undefined, orderDir: undefined,
currentPage: 1, });
itemsPerPage: 50, const [ currentPage, setCurrentPage ] = useState(1);
}; const [ itemsPerPage, setItemsPerPage ] = useState(50);
getSortedPairsForStats(stats, sortingItems) { const getSortedPairsForStats = (stats, sortingItems) => {
const pairs = toPairs(stats); const pairs = toPairs(stats);
const sortedPairs = !this.state.orderField ? pairs : sortBy( const sortedPairs = !order.orderField ? pairs : sortBy(
pipe( pipe(
prop(this.state.orderField === head(keys(sortingItems)) ? 0 : 1), prop(order.orderField === head(keys(sortingItems)) ? 0 : 1),
toLowerIfString toLowerIfString
), ),
pairs pairs
); );
return !this.state.orderDir || this.state.orderDir === 'ASC' ? sortedPairs : reverse(sortedPairs); return !order.orderDir || order.orderDir === 'ASC' ? sortedPairs : reverse(sortedPairs);
} };
const determineStats = (stats, highlightedStats, sortingItems) => {
determineStats(stats, highlightedStats, sortingItems) { const sortedPairs = getSortedPairsForStats(stats, sortingItems);
const sortedPairs = this.getSortedPairsForStats(stats, sortingItems);
const sortedKeys = sortedPairs.map(pickKeyFromPair); const sortedKeys = sortedPairs.map(pickKeyFromPair);
// The highlighted stats have to be ordered based on the regular stats, not on its own values // The highlighted stats have to be ordered based on the regular stats, not on its own values
const sortedHighlightedPairs = highlightedStats && toPairs( const sortedHighlightedPairs = highlightedStats && toPairs(
{ ...zipObj(sortedKeys, sortedKeys.map(() => 0)), ...highlightedStats } { ...zipObj(sortedKeys, sortedKeys.map(() => 0)), ...highlightedStats }
); );
if (sortedPairs.length <= this.state.itemsPerPage) { if (sortedPairs.length <= itemsPerPage) {
return { return {
currentPageStats: fromPairs(sortedPairs), currentPageStats: fromPairs(sortedPairs),
currentPageHighlightedStats: sortedHighlightedPairs && fromPairs(sortedHighlightedPairs), currentPageHighlightedStats: sortedHighlightedPairs && fromPairs(sortedHighlightedPairs),
}; };
} }
const pages = splitEvery(this.state.itemsPerPage, sortedPairs); const pages = splitEvery(itemsPerPage, sortedPairs);
const highlightedPages = sortedHighlightedPairs && splitEvery(this.state.itemsPerPage, sortedHighlightedPairs); const highlightedPages = sortedHighlightedPairs && splitEvery(itemsPerPage, sortedHighlightedPairs);
return { return {
currentPageStats: fromPairs(this.determineCurrentPagePairs(pages)), currentPageStats: fromPairs(determineCurrentPagePairs(pages)),
currentPageHighlightedStats: highlightedPages && fromPairs(this.determineCurrentPagePairs(highlightedPages)), currentPageHighlightedStats: highlightedPages && fromPairs(determineCurrentPagePairs(highlightedPages)),
pagination: this.renderPagination(pages.length), pagination: renderPagination(pages.length),
max: roundTen(max(...sortedPairs.map(pickValueFromPair))), max: roundTen(Math.max(...sortedPairs.map(pickValueFromPair))),
}; };
} };
const determineCurrentPagePairs = (pages) => {
const page = pages[currentPage - 1];
determineCurrentPagePairs(pages) { if (currentPage < pages.length) {
const page = pages[this.state.currentPage - 1];
if (this.state.currentPage < pages.length) {
return page; return page;
} }
@ -82,26 +87,11 @@ export default class SortableBarGraph extends React.Component {
// Using the "hidden" key, the chart will just replace the label by an empty string // Using the "hidden" key, the chart will just replace the label by an empty string
return [ ...page, ...rangeOf(firstPageLength - page.length, (i) => [ `hidden_${i}`, 0 ]) ]; return [ ...page, ...rangeOf(firstPageLength - page.length, (i) => [ `hidden_${i}`, 0 ]) ];
} };
const renderPagination = (pagesCount) =>
<SimplePaginator currentPage={currentPage} pagesCount={pagesCount} setCurrentPage={setCurrentPage} />;
renderPagination(pagesCount) { const { currentPageStats, currentPageHighlightedStats, pagination, max } = determineStats(
const { currentPage } = this.state;
const setCurrentPage = (currentPage) => this.setState({ currentPage });
return <SimplePaginator currentPage={currentPage} pagesCount={pagesCount} setCurrentPage={setCurrentPage} />;
}
render() {
const {
stats,
highlightedStats,
sortingItems,
title,
extraHeaderContent,
withPagination = true,
...rest
} = this.props;
const { currentPageStats, currentPageHighlightedStats, pagination, max } = this.determineStats(
stats, stats,
highlightedStats && keys(highlightedStats).length > 0 ? highlightedStats : undefined, highlightedStats && keys(highlightedStats).length > 0 ? highlightedStats : undefined,
sortingItems sortingItems
@ -115,9 +105,9 @@ export default class SortableBarGraph extends React.Component {
isButton={false} isButton={false}
right right
items={sortingItems} items={sortingItems}
orderField={this.state.orderField} orderField={order.orderField}
orderDir={this.state.orderDir} orderDir={order.orderDir}
onChange={(orderField, orderDir) => this.setState({ orderField, orderDir, currentPage: 1 })} onChange={(orderField, orderDir) => setOrder({ orderField, orderDir }) || setCurrentPage(1)}
/> />
</div> </div>
{withPagination && keys(stats).length > 50 && ( {withPagination && keys(stats).length > 50 && (
@ -125,8 +115,8 @@ export default class SortableBarGraph extends React.Component {
<PaginationDropdown <PaginationDropdown
toggleClassName="btn-sm p-0 mr-3" toggleClassName="btn-sm p-0 mr-3"
ranges={[ 50, 100, 200, 500 ]} ranges={[ 50, 100, 200, 500 ]}
value={this.state.itemsPerPage} value={itemsPerPage}
setValue={(itemsPerPage) => this.setState({ itemsPerPage, currentPage: 1 })} setValue={(itemsPerPage) => setItemsPerPage(itemsPerPage) || setCurrentPage(1)}
/> />
</div> </div>
)} )}
@ -149,5 +139,8 @@ export default class SortableBarGraph extends React.Component {
{...rest} {...rest}
/> />
); );
} };
}
SortableBarGraph.propTypes = propTypes;
export default SortableBarGraph;