From 4c64393df199b45c307a3d70835fde56861208b1 Mon Sep 17 00:00:00 2001
From: Son NK <nguyenkims@hotmail.com>
Date: Sun, 26 Apr 2020 12:25:12 +0200
Subject: [PATCH] Add other sorting options: A-Z, Z-A, new-old, old-new

---
 app/api/serializer.py                        |  6 ++++++
 app/dashboard/templates/dashboard/index.html | 11 ++++++++++-
 app/dashboard/views/index.py                 |  2 --
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/app/api/serializer.py b/app/api/serializer.py
index 58d44d5a..7b8ab497 100644
--- a/app/api/serializer.py
+++ b/app/api/serializer.py
@@ -141,6 +141,12 @@ def get_alias_infos_with_pagination_v2(
 
     if sort == "old2new":
         q = q.order_by(Alias.created_at)
+    elif sort == "new2old":
+        q = q.order_by(Alias.created_at.desc())
+    elif sort == "a2z":
+        q = q.order_by(Alias.email)
+    elif sort == "z2a":
+        q = q.order_by(Alias.email.desc())
     else:
         # default sorting
         q = q.order_by(latest_activity.desc())
diff --git a/app/dashboard/templates/dashboard/index.html b/app/dashboard/templates/dashboard/index.html
index 64b1db0a..638d82fb 100644
--- a/app/dashboard/templates/dashboard/index.html
+++ b/app/dashboard/templates/dashboard/index.html
@@ -70,7 +70,16 @@
               Sort by most recent activity
             </option>
             <option value="old2new" {% if sort == "old2new" %} selected {% endif %}>
-              Oldest Alias to Newest
+              Alias Old-Recent
+            </option>
+            <option value="old2new" {% if sort == "new2old" %} selected {% endif %}>
+              Alias Recent-Old
+            </option>
+            <option value="a2z" {% if sort == "a2z" %} selected {% endif %}>
+              Alias A-Z
+            </option>
+            <option value="z2a" {% if sort == "z2a" %} selected {% endif %}>
+              Alias Z-A
             </option>
           </select>
 
diff --git a/app/dashboard/views/index.py b/app/dashboard/views/index.py
index 40c981e0..3368f379 100644
--- a/app/dashboard/views/index.py
+++ b/app/dashboard/views/index.py
@@ -3,7 +3,6 @@ from flask_login import login_required, current_user
 from sqlalchemy.exc import IntegrityError
 from sqlalchemy.orm import joinedload
 
-from app import email_utils
 from app.api.serializer import get_alias_infos_with_pagination_v2
 from app.dashboard.base import dashboard_bp
 from app.extensions import db
@@ -13,7 +12,6 @@ from app.models import (
     ClientUser,
     DeletedAlias,
     AliasGeneratorEnum,
-    Mailbox,
 )