From 12714ae60180a552fdf4de26e9b82d676b6bf061 Mon Sep 17 00:00:00 2001
From: Son NK <nguyenkims@hotmail.com>
Date: Sun, 26 Apr 2020 12:31:10 +0200
Subject: [PATCH] Add Only enabled alias sorting option

---
 app/api/serializer.py                        | 3 +++
 app/dashboard/templates/dashboard/index.html | 3 +++
 server.py                                    | 9 ++++++---
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/app/api/serializer.py b/app/api/serializer.py
index 7b8ab497..c2422ba0 100644
--- a/app/api/serializer.py
+++ b/app/api/serializer.py
@@ -139,6 +139,9 @@ def get_alias_infos_with_pagination_v2(
             or_(Alias.email.ilike(f"%{query}%"), Alias.note.ilike(f"%{query}%"))
         )
 
+    if sort == "enabled":
+        q = q.filter(Alias.enabled)
+
     if sort == "old2new":
         q = q.order_by(Alias.created_at)
     elif sort == "new2old":
diff --git a/app/dashboard/templates/dashboard/index.html b/app/dashboard/templates/dashboard/index.html
index 638d82fb..424e2103 100644
--- a/app/dashboard/templates/dashboard/index.html
+++ b/app/dashboard/templates/dashboard/index.html
@@ -81,6 +81,9 @@
             <option value="z2a" {% if sort == "z2a" %} selected {% endif %}>
               Alias Z-A
             </option>
+            <option value="enabled" {% if sort == "enabled" %} selected {% endif %}>
+              Only Enabled Alias
+            </option>
           </select>
 
           <input type="search" name="query" placeholder="Enter to search for alias"
diff --git a/server.py b/server.py
index 540d7ee4..2e18a105 100644
--- a/server.py
+++ b/server.py
@@ -8,17 +8,15 @@ from flask import Flask, redirect, url_for, render_template, request, jsonify, f
 from flask_admin import Admin
 from flask_cors import cross_origin
 from flask_login import current_user
+from sentry_sdk.integrations.aiohttp import AioHttpIntegration
 from sentry_sdk.integrations.flask import FlaskIntegration
 from sentry_sdk.integrations.sqlalchemy import SqlalchemyIntegration
-from sentry_sdk.integrations.aiohttp import AioHttpIntegration
-
 
 from app import paddle_utils
 from app.admin_model import SLModelView, SLAdminIndexView
 from app.api.base import api_bp
 from app.auth.base import auth_bp
 from app.config import (
-    DEBUG,
     DB_URI,
     FLASK_SECRET,
     SENTRY_DSN,
@@ -182,6 +180,11 @@ def fake_data():
                 EmailLog.create(user_id=user.id, contact_id=contact.id)
                 db.session.commit()
 
+        # have some disabled alias
+        if i % 5 == 0:
+            a.enabled = False
+            db.session.commit()
+
     CustomDomain.create(user_id=user.id, domain="ab.cd", verified=True)
     CustomDomain.create(
         user_id=user.id, domain="very-long-domain.com.net.org", verified=True