Merge pull request #449 from DemocracyLab/groups_sorting

Groups sorting updates

Author: marlonkeating

civictechprojects/views.py

@@ -708,7 +708,7 @@ def groups_list(request):
         if 'sortField' in query_params:
             group_list = projects_by_sortField(group_list, query_params['sortField'][0])
         else:
-            group_list = projects_by_sortField(group_list, '-group_date_modified')
+            group_list = projects_by_sortField(group_list, 'group_name')
 
         group_count = len(group_list)
 

common/components/common/groups/AboutGroupDisplay.jsx

@@ -47,7 +47,7 @@ class AboutGroupDisplay extends React.PureComponent<Props, State> {
       : [];
     return ({
       group: group,
-      approvedProjects: approvedProjects,
+      approvedProjects: _.reverse(_.sortBy(approvedProjects, (p: ProjectRelationshipAPIData) => p.project_date_modified)),
       issueAreas: this.getUniqueIssueAreas(approvedProjects)
     });
   }

common/components/componentsBySection/FindGroups/GroupSearchSort.jsx

@@ -16,10 +16,10 @@ type State = {|
 |};
 
 const sortOptions: $ReadOnlyArray<SelectOption>  = [
-    {value: "", label: "Date Modified"},
-    {value: "group_name", label: "Name - Ascending"},
-    {value: "-group_name", label: "Name - Descending"}
-  ];
+  {value: "", label: "Name - Ascending"},
+  {value: "-group_name", label: "Name - Descending"},
+  {value: "-group_date_modified", label: "Date Modified"}
+];
 
 class GroupSearchSort extends React.Component<{||}, State> {