fix: show years in descending order

Namanv0509 · Jun 4, 2022 · f2caee3 · f2caee3
1 parent 13569c0
commit f2caee3
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 2 deletions.
diff --git a/src/components/filters/filter-modal.jsx b/src/components/filters/filter-modal.jsx
@@ -84,4 +84,8 @@ FilterModal.propTypes = {
   trigger: PropTypes.node.isRequired,
 }
 
+FilterModal.defaultProps = {
+  ...FilterTemplate.defaultProps,
+}
+
 export default connect(mapStateWithProps, mapDispatchWithProps)(FilterModal)
diff --git a/src/components/filters/filter-template.jsx b/src/components/filters/filter-template.jsx
@@ -70,13 +70,15 @@ class FilterTemplate extends React.Component {
   }
 
   getSortedOptionIndexes() {
+    const sortOrder = this.props.order === "asc" ? 1 : -1
+
     const sortedOptions = this.getAllOptions().sort((a, b) => {
       if (this.isOptionSelected(a) ^ this.isOptionSelected(b)) {
         return this.isOptionSelected(a) ? -1 : 1
       }
 
       if (this.props.sortBy === "name") {
-        return a.name > b.name ? 1 : -1
+        return (a.name > b.name ? 1 : -1) * sortOrder
       }
 
       if (this.props.sortBy === "frequency") {
@@ -123,6 +125,11 @@ class FilterTemplate extends React.Component {
 FilterTemplate.propTypes = {
   name: PropTypes.string.isRequired,
   sortBy: PropTypes.oneOf(["name", "frequency"]).isRequired,
+  order: PropTypes.oneOf(["asc", "desc"]),
+}
+
+FilterTemplate.defaultProps = {
+  order: "asc",
 }
 
 export const mapStateWithProps = (state, ownProps) => {

diff --git a/src/components/filters/filter.jsx b/src/components/filters/filter.jsx
@@ -74,6 +74,7 @@ class Filter extends FilterTemplate {
             name={this.props.name}
             choices={this.props.choices}
             sortBy={this.props.sortBy}
+            order={this.props.order}
             trigger={<div className="filter-view-more">View all</div>}
           />
         </div>
@@ -93,6 +94,7 @@ Filter.propTypes = {
 }
 
 Filter.defaultProps = {
+  ...FilterTemplate.defaultProps,
   showDivider: true,
 }
 

diff --git a/src/components/sidebar.jsx b/src/components/sidebar.jsx
@@ -104,7 +104,7 @@ const Sidebar = ({ config, showFilters }) => {
           </div>
           <Divider className="sidebar-divider" />
           <div className="sidebar-content-filters">
-            <Filter name="years" choices={years} sortBy="name" />
+            <Filter name="years" choices={years} sortBy="name" order="desc" />
             <Filter name="categories" choices={categories} sortBy="name" />
             <Filter
               name="technologies"