Combine 'ResultsFilter' after merge

thewca · Feb 3, 2025 · c822a10 · c822a10
1 parent d8b0cc4
commit c822a10
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 101 deletions.
diff --git a/app/webpacker/components/Results/Rankings/index.jsx b/app/webpacker/components/Results/Rankings/index.jsx
@@ -5,7 +5,7 @@ import { Container } from 'semantic-ui-react';
 import RankingsTable from './RankingsTable';
 import WCAQueryClientProvider from '../../../lib/providers/WCAQueryClientProvider';
 import { rankingsUrl } from '../../../lib/requests/routes.js.erb';
-import ResultsFilter from '../resultsFilter';
+import ResultsFilter from '../ResultsFilter';
 
 const ActionTypes = {
   SET_EVENT: 'SET_EVENT',
@@ -65,6 +65,8 @@ export default function Wrapper() {
   );
 }
 
+const SHOW_CATEGORIES = ['100 persons', '100 results', 'by region', 'history', 'mixed history'];
+
 export function Rankings() {
   const [filterState, dispatch] = useReducer(
     filterReducer,
@@ -94,7 +96,11 @@ export function Rankings() {
 
   return (
     <Container fluid>
-      <ResultsFilter filterState={filterState} filterActions={filterActions} />
+      <ResultsFilter
+        filterState={filterState}
+        filterActions={filterActions}
+        showCategories={SHOW_CATEGORIES}
+      />
       <RankingsTable filterState={filterState} />
     </Container>
   );

diff --git a/app/webpacker/components/Results/ResultsFilter.jsx b/app/webpacker/components/Results/ResultsFilter.jsx
@@ -69,7 +69,7 @@ export default function ResultsFilter({
                 >
                   {I18n.t('results.selector_elements.type_selector.single')}
                 </Button>
-                <Button active={rankingType === 'average'} onClick={() => setRankingType('average')}>{I18n.t('results.selector_elements.type_selector.average')}</Button>
+                { event !== '333mbf' && <Button active={rankingType === 'average'} onClick={() => setRankingType('average')}>{I18n.t('results.selector_elements.type_selector.average')}</Button>}
               </ButtonGroup>
             </Form.Field>
           )}
@@ -78,19 +78,19 @@ export default function ResultsFilter({
           {/*    <Button>All years</Button> */}
           {/*   </ButtonGroup> */}
           {/* </Form.Field> */}
-          <Form.Field width={4}>
+          <Form.Field>
             <Header as="h6">{I18n.t('results.selector_elements.gender_selector.gender')}</Header>
             <ButtonGroup compact color="teal" widths={3}>
               <Button active={gender === 'All'} onClick={() => setGender('All')}>{I18n.t('results.selector_elements.gender_selector.gender_all')}</Button>
               <Button active={gender === 'Male'} onClick={() => setGender('Male')}>{I18n.t('results.selector_elements.gender_selector.male')}</Button>
               <Button active={gender === 'Female'} onClick={() => setGender('Female')}>{I18n.t('results.selector_elements.gender_selector.female')}</Button>
             </ButtonGroup>
           </Form.Field>
-          <Form.Field width={2}>
+          <Form.Field>
             <Header as="h6">{I18n.t('results.selector_elements.show_selector.show')}</Header>
             <ButtonGroup compact color="teal" widths={showCategories.length}>
               {showCategories.map((category) => (
-                <Button active={show === category} onClick={() => setShow(category)}>{I18n.t(`results.selector_elements.show_selector.${_.snakeCase(category)}`)}</Button>
+                <Button key={category} active={show === category} onClick={() => setShow(category)}>{I18n.t(`results.selector_elements.show_selector.${_.snakeCase(category.replace(/^\d+/, '').trim())}`)}</Button>
               ))}
             </ButtonGroup>
           </Form.Field>

diff --git a/app/webpacker/components/Results/resultsFilter.jsx b/app/webpacker/components/Results/resultsFilter.jsx