fix table sorting

CHANGELOG.md

@@ -3,6 +3,12 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+## [v1.16.1]
+
+### Fixed
+
+- Sort tables properly 
+
 ## [v1.16.0]
 
 ### Added

VERSION

@@ -1 +1 @@
-1.16.0
+1.16.1

ansible/env_vars/base.yml

@@ -1,7 +1,7 @@
 ---
 
 git_repo: https://github.com/monty5811/apostello.git
-git_version: v1.16.0
+git_version: v1.16.1
 
 project_name: apostello
 application_name: apostello

assets/elm/Helpers.elm

@@ -1,6 +1,7 @@
 module Helpers exposing (..)
 
 import Decoders exposing (..)
+import Date
 import Dict
 import Http
 import Json.Decode as Decode
@@ -105,3 +106,17 @@ handleLoadingFailed model =
 handleNotSaved : Model -> ( Model, Cmd Msg )
 handleNotSaved model =
     ( createNotSavedNotification model, Cmd.none )
+
+
+compareByTR : { a | time_received : String } -> Float
+compareByTR sms =
+    let
+        date =
+            Date.fromString sms.time_received
+    in
+        case date of
+            Ok d ->
+                Date.toTime d
+
+            Err _ ->
+                toFloat 1

assets/elm/Updates/ElvantoImport.elm

@@ -60,7 +60,11 @@ update msg model =
 
 updateGroups : ElvantoImportModel -> ElvantoGroups -> ElvantoImportModel
 updateGroups model newGroups =
-    { model | groups = mergeItems model.groups newGroups }
+    { model
+        | groups =
+            mergeItems model.groups newGroups
+                |> List.sortBy .name
+    }
 
 
 pullGroups : String -> Cmd Msg

assets/elm/Updates/GroupComposer.elm

@@ -32,8 +32,8 @@ updateGroups resp model =
             mergeItems model.groups resp.results
     in
         { model
-            | groups = newGroups
-            , people = (collectPeople newGroups)
+            | groups = newGroups |> List.sortBy .name
+            , people = (collectPeople newGroups) |> List.sortBy .full_name
         }
 
 

assets/elm/Updates/GroupTable.elm

@@ -38,7 +38,11 @@ update msg model =
 
 updateGroups : GroupTableModel -> ApostelloResponse RecipientGroup -> GroupTableModel
 updateGroups model resp =
-    { model | groups = mergeItems model.groups resp.results }
+    { model
+        | groups =
+            mergeItems model.groups resp.results
+                |> List.sortBy .name
+    }
 
 
 optArchiveGroup : GroupTableModel -> Int -> GroupTableModel

assets/elm/Updates/InboundTable.elm

@@ -36,7 +36,12 @@ update msg model =
 
 updateSms : InboundTableModel -> SmsInbounds -> InboundTableModel
 updateSms model newSms =
-    { model | sms = mergeItems model.sms newSms }
+    { model
+        | sms =
+            mergeItems model.sms newSms
+                |> List.sortBy compareByTR
+                |> List.reverse
+    }
 
 
 reprocessSms : CSRFToken -> Int -> Cmd Msg

assets/elm/Updates/KeyRespTable.elm

@@ -45,7 +45,12 @@ update msg model =
 
 updateSms : KeyRespTableModel -> SmsInbounds -> KeyRespTableModel
 updateSms model newSms =
-    { model | sms = mergeItems model.sms newSms }
+    { model
+        | sms =
+            mergeItems model.sms newSms
+                |> List.sortBy compareByTR
+                |> List.reverse
+    }
 
 
 optToggleDealtWith : KeyRespTableModel -> Int -> KeyRespTableModel

assets/elm/Updates/KeywordTable.elm

@@ -45,7 +45,7 @@ optArchiveKeyword model pk =
 
 updateKeywords : KeywordTableModel -> ApostelloResponse Keyword -> KeywordTableModel
 updateKeywords model resp =
-    { model | keywords = mergeItems model.keywords resp.results }
+    { model | keywords = mergeItems model.keywords resp.results |> List.sortBy .keyword }
 
 
 toggleKeywordArchive : CSRFToken -> Bool -> Int -> Cmd Msg

assets/elm/Updates/OutboundTable.elm

@@ -1,6 +1,7 @@
 module Updates.OutboundTable exposing (update)
 
 import Actions exposing (determineRespCmd)
+import Date
 import Helpers exposing (..)
 import Messages exposing (..)
 import Models exposing (..)
@@ -23,4 +24,23 @@ update msg model =
 
 updateSms : OutboundTableModel -> ApostelloResponse SmsOutbound -> OutboundTableModel
 updateSms model resp =
-    { model | sms = mergeItems model.sms resp.results }
+    { model
+        | sms =
+            mergeItems model.sms resp.results
+                |> List.sortBy compareByTS
+                |> List.reverse
+    }
+
+
+compareByTS : SmsOutbound -> Float
+compareByTS sms =
+    let
+        date =
+            Date.fromString sms.time_sent
+    in
+        case date of
+            Ok d ->
+                Date.toTime d
+
+            Err _ ->
+                toFloat 1

assets/elm/Updates/RecipientTable.elm

@@ -38,7 +38,11 @@ update msg model =
 
 updateRecipients : RecipientTableModel -> List Recipient -> RecipientTableModel
 updateRecipients model newRecipients =
-    { model | recipients = mergeItems model.recipients newRecipients }
+    { model
+        | recipients =
+            mergeItems model.recipients newRecipients
+                |> List.sortBy .last_name
+    }
 
 
 optRemoveRecipient : RecipientTableModel -> Int -> RecipientTableModel

assets/elm/Updates/ScheduledSmsTable.elm

@@ -1,6 +1,7 @@
 module Updates.ScheduledSmsTable exposing (update)
 
 import Actions exposing (determineRespCmd)
+import Date
 import Decoders exposing (decodeAlwaysTrue)
 import DjangoSend exposing (post)
 import Helpers exposing (..)
@@ -36,7 +37,11 @@ update msg model =
 
 updateSms : ScheduledSmsTableModel -> List QueuedSms -> ScheduledSmsTableModel
 updateSms model newSms =
-    { model | sms = mergeItems model.sms newSms }
+    { model
+        | sms =
+            mergeItems model.sms newSms
+                |> List.sortBy (Date.toTime << .time_to_send)
+    }
 
 
 optCancelSms : ScheduledSmsTableModel -> Int -> ScheduledSmsTableModel

assets/elm/Updates/UserProfileTable.elm

@@ -44,7 +44,11 @@ update msg model =
 
 updateUserProfiles : UserProfileTableModel -> List UserProfile -> UserProfileTableModel
 updateUserProfiles model profiles =
-    { model | userprofiles = mergeItems model.userprofiles profiles }
+    { model
+        | userprofiles =
+            mergeItems model.userprofiles profiles
+                |> List.sortBy (.email << .user)
+    }
 
 
 toggleField : CSRFToken -> UserProfile -> Cmd Msg

assets/elm/Updates/Wall.elm

@@ -36,7 +36,12 @@ update msg model =
 
 updateSms : WallModel -> List SmsInboundSimple -> WallModel
 updateSms model newSms =
-    { model | sms = mergeItems model.sms newSms }
+    { model
+        | sms =
+            mergeItems model.sms newSms
+                |> List.sortBy compareByTR
+                |> List.reverse
+    }
 
 
 toggleWallDisplay : CSRFToken -> Bool -> Int -> Cmd Msg

scripts/ansible_install.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 set -e
 # setup some constants
-AP_VER=v1.16.0
+AP_VER=v1.16.1
 REPO_URL=https://github.com/monty5811/apostello.git
 HOME_DIR=/home/apostello
 CUSTOM_VARS_FILE=$HOME_DIR/custom_vars.yml