Sort queues and courses by name

CHANGELOG.md

@@ -9,6 +9,7 @@ with the current date and the next changes should go under a **[Next]** header.
 
 * Add open and closed cards to course pages. ([@genevievehelsel](https://github.com/genevievehelsel) in [#142](https://github.com/illinois/queue/pull/142))
 * Upgrade to Next 7 and React 16.5.2. ([@nwalters512](https://github.com/nwalters512) in [#143](https://github.com/illinois/queue/pull/143))
+* Sort queues and courses by name. ([@genevievehelsel](https://github.com/genevievehelsel) in [#144](https://github.com/illinois/queue/pull/144))
 
 ## 5 September 2018
 

src/components/QueueCardList.js

@@ -68,6 +68,19 @@ class QueueCardList extends React.Component {
     }))
   }
 
+  queueSorter(l, r) {
+    const queueL = this.props.queues[l]
+    const queueR = this.props.queues[r]
+    const courseNameL = this.props.courses[queueL.courseId].name
+    const courseNameR = this.props.courses[queueR.courseId].name
+
+    if (courseNameL === courseNameR) {
+      return queueL.name > queueR.name
+    }
+
+    return courseNameL > courseNameR
+  }
+
   render() {
     const CardCol = ({ children, ...rest }) => (
       <Col
@@ -86,6 +99,9 @@ class QueueCardList extends React.Component {
       const handleQueueClick = id => {
         Router.pushRoute('queue', { id })
       }
+
+      this.props.queueIds.sort(this.queueSorter.bind(this))
+
       queues = this.props.queueIds.map(queueId => {
         const queue = this.props.queues[queueId]
         const courseName = this.props.courses[queue.courseId].name

src/pages/index.js

@@ -244,7 +244,9 @@ const mapStateToProps = state => ({
   showCreateQueueButton:
     state.user.user &&
     (state.user.user.isAdmin || state.user.user.staffAssignments.length > 0),
-  courses: mapObjectToArray(state.courses.courses),
+  courses: mapObjectToArray(state.courses.courses).sort((a, b) => {
+    return a.name > b.name
+  }),
   queues: mapObjectToArray(state.queues.queues),
 })