[spalenque] - #13384 * change order of user stories

Author: santipalenque

user-stories/code/infrastructure/repositories/SapphireUserStoryRepository.php

@@ -22,24 +22,24 @@ public function __construct(){
 		parent::__construct(new UserStoryDO());
 	}
 
-    public function getAllStories($sort_by = 'LastEdited') {
-        return UserStoryDO::get()->sort($sort_by);
+    public function getAllStories($sort_by = 'LastEdited', $sort_dir = 'DESC') {
+        return UserStoryDO::get()->sort($sort_by, $sort_dir);
     }
 
-    public function getAllActive($sort_by = 'LastEdited') {
-        return UserStoryDO::get()->filter('Active',1)->sort($sort_by);
+    public function getAllActive($sort_by = 'LastEdited', $sort_dir = 'DESC') {
+        return UserStoryDO::get()->filter('Active',1)->sort($sort_by, $sort_dir);
     }
 
     public function findAllActive($search_term) {
         return UserStoryDO::get()->filter('Active',1)
             ->where("Name LIKE '%$search_term%' OR Description LIKE '%$search_term%'")
-            ->sort('LastEdited');
+            ->sort('LastEdited', 'DESC');
     }
 
     public function findAllActiveByTag($tag) {
         return UserStoryDO::get()
             ->filter(['Active' => 1, 'Tags.Tag' => $tag])
-            ->sort('LastEdited');
+            ->sort('LastEdited', 'DESC');
     }
 
 }

user-stories/code/model/IUserStoryRepository.php

@@ -14,9 +14,9 @@
  **/
 interface IUserStoryRepository
 {
-    public function getAllStories($sort_by = 'LastEdited');
+    public function getAllStories($sort_by = 'LastEdited', $sort_dir = 'DESC');
 
-    public function getAllActive($sort_by = 'LastEdited');
+    public function getAllActive($sort_by = 'LastEdited', $sort_dir = 'DESC');
 
     public function findAllActive($search_term);
 

user-stories/ui/source/js/components/views/StoryUnGroupedView.js

@@ -29,11 +29,17 @@ export default ({
     }
 
     const sortStories = function(stories, compareProp) {
+        compareProp = (compareProp == 'search') ? 'date' : compareProp;
+
         let sorted_stories = stories.sort((a,b) => {
             const aName = a[compareProp];
             const bName = b[compareProp];
 
-            return aName > bName ? 1 : (aName < bName ? -1 : 0)
+            if (compareProp == 'date') { // date must be DESC
+                return aName < bName ? 1 : (aName > bName ? -1 : 0)
+            } else {
+                return aName > bName ? 1 : (aName < bName ? -1 : 0)
+            }
         });
 
         return sorted_stories;