From 6c1b39bc044db54c62948c1ff910986afbc4955a Mon Sep 17 00:00:00 2001 From: Son NK <> Date: Fri, 24 Apr 2020 20:57:01 +0200 Subject: [PATCH 01/11] remove AliasInfo.latest_activity --- app/dashboard/views/index.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/dashboard/views/index.py b/app/dashboard/views/index.py index 396c8180..fd7f69de 100644 --- a/app/dashboard/views/index.py +++ b/app/dashboard/views/index.py @@ -31,7 +31,6 @@ class AliasInfo: nb_blocked: int nb_reply: int - latest_activity: Arrow latest_email_log: EmailLog = None latest_contact: Contact = None @@ -225,7 +224,6 @@ def get_alias_infos(user, query=None, highlight_alias_id=None) -> [AliasInfo]: nb_forward=0, nb_reply=0, highlight=alias.id == highlight_alias_id, - latest_activity=alias.created_at, ) alias_info = aliases[alias.email] From 4727249958feca6a0ff23a8dfedfd199c4ad0b7b Mon Sep 17 00:00:00 2001 From: Son NK Date: Sat, 25 Apr 2020 10:57:25 +0200 Subject: [PATCH 02/11] do not use alias_info.highlight --- app/dashboard/templates/dashboard/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/dashboard/templates/dashboard/index.html b/app/dashboard/templates/dashboard/index.html index cfe967c2..8945520c 100644 --- a/app/dashboard/templates/dashboard/index.html +++ b/app/dashboard/templates/dashboard/index.html @@ -77,7 +77,7 @@ {% set alias = alias_info.alias %}
-
+
From 5839c637f6f5d9f710be1ebfd23cc44453b89da7 Mon Sep 17 00:00:00 2001 From: Son NK Date: Sat, 25 Apr 2020 11:06:35 +0200 Subject: [PATCH 03/11] use pagination for alias --- app/dashboard/templates/dashboard/index.html | 17 ++++ app/dashboard/views/index.py | 102 +++++++++++-------- 2 files changed, 74 insertions(+), 45 deletions(-) diff --git a/app/dashboard/templates/dashboard/index.html b/app/dashboard/templates/dashboard/index.html index 8945520c..52142f27 100644 --- a/app/dashboard/templates/dashboard/index.html +++ b/app/dashboard/templates/dashboard/index.html @@ -279,6 +279,23 @@ {% endfor %}
+
+
+ +
+
+ {% if client_users %}
diff --git a/app/dashboard/views/index.py b/app/dashboard/views/index.py index fd7f69de..10a836f2 100644 --- a/app/dashboard/views/index.py +++ b/app/dashboard/views/index.py @@ -3,11 +3,12 @@ from dataclasses import dataclass from arrow import Arrow from flask import render_template, request, redirect, url_for, flash from flask_login import login_required, current_user -from sqlalchemy import or_ +from sqlalchemy import or_, func, case from sqlalchemy.exc import IntegrityError from sqlalchemy.orm import joinedload from app import email_utils +from app.config import PAGE_LIMIT from app.dashboard.base import dashboard_bp from app.extensions import db from app.log import LOG @@ -42,6 +43,10 @@ class AliasInfo: @login_required def index(): query = request.args.get("query") or "" + page = 0 + if request.args.get("page"): + page = int(request.args.get("page")) + highlight_alias_id = None if request.args.get("highlight_alias_id"): highlight_alias_id = int(request.args.get("highlight_alias_id")) @@ -186,28 +191,36 @@ def index(): return render_template( "dashboard/index.html", client_users=client_users, - alias_infos=get_alias_infos(current_user, query, highlight_alias_id), + alias_infos=get_alias_infos_with_pagination(current_user, page, query), highlight_alias_id=highlight_alias_id, query=query, AliasGeneratorEnum=AliasGeneratorEnum, mailboxes=mailboxes, show_intro=show_intro, + page=page, ) -def get_alias_infos(user, query=None, highlight_alias_id=None) -> [AliasInfo]: - if query: - query = query.strip().lower() - - aliases = {} # dict of alias email and AliasInfo +def get_alias_infos_with_pagination(user, page: int, query=None) -> [AliasInfo]: + ret: [AliasInfo] = [] + latest_activity = func.max( + case( + [ + (Alias.created_at > EmailLog.created_at, Alias.created_at), + (Alias.created_at < EmailLog.created_at, EmailLog.created_at), + ], + else_=Alias.created_at, + ) + ).label("latest") q = ( - db.session.query(Alias, Contact, EmailLog, Mailbox) + db.session.query(Alias, latest_activity) + .options(joinedload(Alias.mailbox)) .join(Contact, Alias.id == Contact.alias_id, isouter=True) .join(EmailLog, Contact.id == EmailLog.contact_id, isouter=True) - .join(Mailbox, Alias.mailbox_id == Mailbox.id, isouter=True) .filter(Alias.user_id == user.id) - .order_by(Alias.created_at.desc()) + .group_by(Alias.id) + .order_by(latest_activity.desc()) ) if query: @@ -215,26 +228,36 @@ def get_alias_infos(user, query=None, highlight_alias_id=None) -> [AliasInfo]: or_(Alias.email.ilike(f"%{query}%"), Alias.note.ilike(f"%{query}%")) ) - for alias, contact, email_log, mailbox in q: - if alias.email not in aliases: - aliases[alias.email] = AliasInfo( - alias=alias, - mailbox=mailbox, - nb_blocked=0, - nb_forward=0, - nb_reply=0, - highlight=alias.id == highlight_alias_id, - ) + q = q.limit(PAGE_LIMIT).offset(page * PAGE_LIMIT) - alias_info = aliases[alias.email] - if not email_log: - continue + for alias, latest_activity in q: + ret.append(get_alias_info(alias)) - if email_log.created_at > alias_info.latest_activity: - alias_info.latest_activity = email_log.created_at - alias_info.latest_email_log = email_log - alias_info.latest_contact = contact + # only show intro on the first enabled alias + for alias_info in ret: + if alias_info.alias.enabled: + alias_info.show_intro_test_send_email = True + break + return ret + + +def get_alias_info(alias: Alias) -> AliasInfo: + q = ( + db.session.query(Contact, EmailLog) + .filter(Contact.alias_id == alias.id) + .filter(EmailLog.contact_id == Contact.id) + ) + + latest_activity: Arrow = alias.created_at + latest_email_log = None + latest_contact = None + + alias_info = AliasInfo( + alias=alias, nb_blocked=0, nb_forward=0, nb_reply=0, mailbox=alias.mailbox + ) + + for contact, email_log in q: if email_log.is_reply: alias_info.nb_reply += 1 elif email_log.blocked: @@ -242,23 +265,12 @@ def get_alias_infos(user, query=None, highlight_alias_id=None) -> [AliasInfo]: else: alias_info.nb_forward += 1 - ret = list(aliases.values()) - ret = sorted(ret, key=lambda a: a.latest_activity, reverse=True) + if email_log.created_at > latest_activity: + latest_activity = email_log.created_at + latest_email_log = email_log + latest_contact = contact - # make sure the highlighted alias is the first element - highlight_index = None - for ix, alias in enumerate(ret): - if alias.highlight: - highlight_index = ix - break + alias_info.latest_contact = latest_contact + alias_info.latest_email_log = latest_email_log - if highlight_index: - ret.insert(0, ret.pop(highlight_index)) - - # only show intro on the first enabled alias - for alias in ret: - if alias.alias.enabled: - alias.show_intro_test_send_email = True - break - - return ret + return alias_info From 1c9d9530440bd5c71a92177e8003cac28e3a2231 Mon Sep 17 00:00:00 2001 From: Son NK Date: Sat, 25 Apr 2020 11:14:17 +0200 Subject: [PATCH 04/11] add mailbox to AliasInfo --- app/api/serializer.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/app/api/serializer.py b/app/api/serializer.py index 94a874d3..0a9d34a1 100644 --- a/app/api/serializer.py +++ b/app/api/serializer.py @@ -2,6 +2,7 @@ from dataclasses import dataclass from arrow import Arrow from sqlalchemy import or_, func, case +from sqlalchemy.orm import joinedload from app.config import PAGE_LIMIT from app.extensions import db @@ -11,6 +12,7 @@ from app.models import Alias, Contact, EmailLog, Mailbox @dataclass class AliasInfo: alias: Alias + mailbox: Mailbox nb_forward: int nb_blocked: int @@ -89,6 +91,7 @@ def get_alias_infos_with_pagination(user, page_id=0, query=None) -> [AliasInfo]: ret = [] q = ( db.session.query(Alias) + .options(joinedload(Alias.mailbox)) .filter(Alias.user_id == user.id) .order_by(Alias.created_at.desc()) ) @@ -120,6 +123,7 @@ def get_alias_infos_with_pagination_v2(user, page_id=0, query=None) -> [AliasInf q = ( db.session.query(Alias, latest_activity) + .options(joinedload(Alias.mailbox)) .join(Contact, Alias.id == Contact.alias_id, isouter=True) .join(EmailLog, Contact.id == EmailLog.contact_id, isouter=True) .filter(Alias.user_id == user.id) @@ -147,7 +151,9 @@ def get_alias_info(alias: Alias) -> AliasInfo: .filter(EmailLog.contact_id == Contact.id) ) - alias_info = AliasInfo(alias=alias, nb_blocked=0, nb_forward=0, nb_reply=0,) + alias_info = AliasInfo( + alias=alias, nb_blocked=0, nb_forward=0, nb_reply=0, mailbox=alias.mailbox + ) for _, el in q: if el.is_reply: @@ -171,7 +177,9 @@ def get_alias_info_v2(alias: Alias) -> AliasInfo: latest_email_log = None latest_contact = None - alias_info = AliasInfo(alias=alias, nb_blocked=0, nb_forward=0, nb_reply=0,) + alias_info = AliasInfo( + alias=alias, nb_blocked=0, nb_forward=0, nb_reply=0, mailbox=alias.mailbox + ) for contact, email_log in q: if email_log.is_reply: From 72f3e47c3c6eaa268e10b73345fd9f8d918dbc71 Mon Sep 17 00:00:00 2001 From: Son NK Date: Sat, 25 Apr 2020 11:25:45 +0200 Subject: [PATCH 05/11] remove show_intro_test_send_email, highlight from AliasInfo --- app/dashboard/templates/dashboard/index.html | 3 ++- app/dashboard/views/index.py | 9 --------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/app/dashboard/templates/dashboard/index.html b/app/dashboard/templates/dashboard/index.html index 52142f27..f6aa8fa8 100644 --- a/app/dashboard/templates/dashboard/index.html +++ b/app/dashboard/templates/dashboard/index.html @@ -179,7 +179,8 @@
[AliasInfo]: for alias, latest_activity in q: ret.append(get_alias_info(alias)) - # only show intro on the first enabled alias - for alias_info in ret: - if alias_info.alias.enabled: - alias_info.show_intro_test_send_email = True - break - return ret From 95b71435f92e15e0e93cf4d5c704b63cc1b3d007 Mon Sep 17 00:00:00 2001 From: Son NK Date: Sat, 25 Apr 2020 11:27:27 +0200 Subject: [PATCH 06/11] refactoring: use get_alias_infos_with_pagination_v2 --- app/dashboard/views/index.py | 72 +----------------------------------- 1 file changed, 2 insertions(+), 70 deletions(-) diff --git a/app/dashboard/views/index.py b/app/dashboard/views/index.py index d4942cdb..b00bc1c3 100644 --- a/app/dashboard/views/index.py +++ b/app/dashboard/views/index.py @@ -8,6 +8,7 @@ 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.config import PAGE_LIMIT from app.dashboard.base import dashboard_bp from app.extensions import db @@ -188,7 +189,7 @@ def index(): return render_template( "dashboard/index.html", client_users=client_users, - alias_infos=get_alias_infos_with_pagination(current_user, page, query), + alias_infos=get_alias_infos_with_pagination_v2(current_user, page, query), highlight_alias_id=highlight_alias_id, query=query, AliasGeneratorEnum=AliasGeneratorEnum, @@ -196,72 +197,3 @@ def index(): show_intro=show_intro, page=page, ) - - -def get_alias_infos_with_pagination(user, page: int, query=None) -> [AliasInfo]: - ret: [AliasInfo] = [] - latest_activity = func.max( - case( - [ - (Alias.created_at > EmailLog.created_at, Alias.created_at), - (Alias.created_at < EmailLog.created_at, EmailLog.created_at), - ], - else_=Alias.created_at, - ) - ).label("latest") - - q = ( - db.session.query(Alias, latest_activity) - .options(joinedload(Alias.mailbox)) - .join(Contact, Alias.id == Contact.alias_id, isouter=True) - .join(EmailLog, Contact.id == EmailLog.contact_id, isouter=True) - .filter(Alias.user_id == user.id) - .group_by(Alias.id) - .order_by(latest_activity.desc()) - ) - - if query: - q = q.filter( - or_(Alias.email.ilike(f"%{query}%"), Alias.note.ilike(f"%{query}%")) - ) - - q = q.limit(PAGE_LIMIT).offset(page * PAGE_LIMIT) - - for alias, latest_activity in q: - ret.append(get_alias_info(alias)) - - return ret - - -def get_alias_info(alias: Alias) -> AliasInfo: - q = ( - db.session.query(Contact, EmailLog) - .filter(Contact.alias_id == alias.id) - .filter(EmailLog.contact_id == Contact.id) - ) - - latest_activity: Arrow = alias.created_at - latest_email_log = None - latest_contact = None - - alias_info = AliasInfo( - alias=alias, nb_blocked=0, nb_forward=0, nb_reply=0, mailbox=alias.mailbox - ) - - for contact, email_log in q: - if email_log.is_reply: - alias_info.nb_reply += 1 - elif email_log.blocked: - alias_info.nb_blocked += 1 - else: - alias_info.nb_forward += 1 - - if email_log.created_at > latest_activity: - latest_activity = email_log.created_at - latest_email_log = email_log - latest_contact = contact - - alias_info.latest_contact = latest_contact - alias_info.latest_email_log = latest_email_log - - return alias_info From ca6350cc271b304dbbb70fa65d8552b55c8a0d4f Mon Sep 17 00:00:00 2001 From: Son NK Date: Sat, 25 Apr 2020 11:30:09 +0200 Subject: [PATCH 07/11] optimize import in all files --- app/api/base.py | 1 + app/api/views/auth_mfa.py | 2 +- app/auth/views/register.py | 4 ++-- app/auth/views/reset_password.py | 1 - app/config.py | 2 -- app/dashboard/views/alias_contact_manager.py | 1 - app/dashboard/views/billing.py | 2 +- app/dashboard/views/index.py | 20 -------------------- app/dashboard/views/lifetime_licence.py | 8 +------- app/dashboard/views/mailbox.py | 3 +-- app/dashboard/views/mailbox_detail.py | 7 ++++--- app/dashboard/views/referral.py | 2 +- app/developer/views/new_client.py | 2 -- app/models.py | 2 +- app/oauth/views/authorize.py | 2 +- app/s3.py | 2 +- 16 files changed, 15 insertions(+), 46 deletions(-) diff --git a/app/api/base.py b/app/api/base.py index 5e7ca419..36d9bd50 100644 --- a/app/api/base.py +++ b/app/api/base.py @@ -3,6 +3,7 @@ from functools import wraps import arrow from flask import Blueprint, request, jsonify, g from flask_login import current_user + from app.extensions import db from app.models import ApiKey diff --git a/app/api/views/auth_mfa.py b/app/api/views/auth_mfa.py index c53a0b9c..38de5426 100644 --- a/app/api/views/auth_mfa.py +++ b/app/api/views/auth_mfa.py @@ -1,7 +1,7 @@ import pyotp from flask import jsonify, request from flask_cors import cross_origin -from itsdangerous import Signer, BadSignature +from itsdangerous import Signer from app.api.base import api_bp from app.config import FLASK_SECRET diff --git a/app/auth/views/register.py b/app/auth/views/register.py index fd9acfe0..e4caa022 100644 --- a/app/auth/views/register.py +++ b/app/auth/views/register.py @@ -6,11 +6,11 @@ from wtforms import StringField, validators from app import email_utils, config from app.auth.base import auth_bp from app.auth.views.login_utils import get_referral -from app.config import URL, DISABLE_REGISTRATION +from app.config import URL from app.email_utils import can_be_used_as_personal_email, email_already_used from app.extensions import db from app.log import LOG -from app.models import User, ActivationCode, Referral +from app.models import User, ActivationCode from app.utils import random_string, encode_url diff --git a/app/auth/views/reset_password.py b/app/auth/views/reset_password.py index 77635a1a..1e7ba046 100644 --- a/app/auth/views/reset_password.py +++ b/app/auth/views/reset_password.py @@ -1,4 +1,3 @@ -import arrow from flask import request, flash, render_template, redirect, url_for from flask_login import login_user from flask_wtf import FlaskForm diff --git a/app/config.py b/app/config.py index b0fbad06..158c1331 100644 --- a/app/config.py +++ b/app/config.py @@ -2,8 +2,6 @@ import os import random import string import subprocess -import tempfile -from uuid import uuid4 from dotenv import load_dotenv diff --git a/app/dashboard/views/alias_contact_manager.py b/app/dashboard/views/alias_contact_manager.py index 1ad1ead1..8f3f4752 100644 --- a/app/dashboard/views/alias_contact_manager.py +++ b/app/dashboard/views/alias_contact_manager.py @@ -1,5 +1,4 @@ import re -from email.utils import parseaddr from flask import render_template, request, redirect, url_for, flash from flask_login import login_required, current_user diff --git a/app/dashboard/views/billing.py b/app/dashboard/views/billing.py index 7c44e73d..9f8def67 100644 --- a/app/dashboard/views/billing.py +++ b/app/dashboard/views/billing.py @@ -3,9 +3,9 @@ from flask_login import login_required, current_user from app.config import PADDLE_MONTHLY_PRODUCT_ID, PADDLE_YEARLY_PRODUCT_ID from app.dashboard.base import dashboard_bp +from app.extensions import db from app.log import LOG from app.models import Subscription, PlanEnum -from app.extensions import db from app.paddle_utils import cancel_subscription, change_plan diff --git a/app/dashboard/views/index.py b/app/dashboard/views/index.py index b00bc1c3..ca5c1941 100644 --- a/app/dashboard/views/index.py +++ b/app/dashboard/views/index.py @@ -1,42 +1,22 @@ -from dataclasses import dataclass - -from arrow import Arrow from flask import render_template, request, redirect, url_for, flash from flask_login import login_required, current_user -from sqlalchemy import or_, func, case 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.config import PAGE_LIMIT from app.dashboard.base import dashboard_bp from app.extensions import db from app.log import LOG from app.models import ( Alias, ClientUser, - Contact, - EmailLog, DeletedAlias, AliasGeneratorEnum, Mailbox, ) -@dataclass -class AliasInfo: - alias: Alias - mailbox: Mailbox - - nb_forward: int - nb_blocked: int - nb_reply: int - - latest_email_log: EmailLog = None - latest_contact: Contact = None - - @dashboard_bp.route("/", methods=["GET", "POST"]) @login_required def index(): diff --git a/app/dashboard/views/lifetime_licence.py b/app/dashboard/views/lifetime_licence.py index ede94836..aef2d365 100644 --- a/app/dashboard/views/lifetime_licence.py +++ b/app/dashboard/views/lifetime_licence.py @@ -3,13 +3,7 @@ from flask_login import login_required, current_user from flask_wtf import FlaskForm from wtforms import StringField, validators -from app.config import ( - PADDLE_VENDOR_ID, - PADDLE_MONTHLY_PRODUCT_ID, - PADDLE_YEARLY_PRODUCT_ID, - URL, - ADMIN_EMAIL, -) +from app.config import ADMIN_EMAIL from app.dashboard.base import dashboard_bp from app.email_utils import send_email from app.extensions import db diff --git a/app/dashboard/views/mailbox.py b/app/dashboard/views/mailbox.py index 38ca190a..67894f02 100644 --- a/app/dashboard/views/mailbox.py +++ b/app/dashboard/views/mailbox.py @@ -1,7 +1,7 @@ from flask import render_template, request, redirect, url_for, flash from flask_login import login_required, current_user from flask_wtf import FlaskForm -from itsdangerous import Signer, BadSignature +from itsdangerous import Signer from wtforms import validators from wtforms.fields.html5 import EmailField @@ -9,7 +9,6 @@ from app.config import EMAIL_DOMAIN, ALIAS_DOMAINS, MAILBOX_SECRET, URL from app.dashboard.base import dashboard_bp from app.email_utils import ( can_be_used_as_personal_email, - email_already_used, mailbox_already_used, render, send_email, diff --git a/app/dashboard/views/mailbox_detail.py b/app/dashboard/views/mailbox_detail.py index c74baf06..7bf9b29f 100644 --- a/app/dashboard/views/mailbox_detail.py +++ b/app/dashboard/views/mailbox_detail.py @@ -1,21 +1,22 @@ +from smtplib import SMTPRecipientsRefused + from flask import render_template, request, redirect, url_for, flash from flask_login import login_required, current_user from flask_wtf import FlaskForm -from itsdangerous import Signer, BadSignature +from itsdangerous import Signer from wtforms import validators from wtforms.fields.html5 import EmailField from app.config import MAILBOX_SECRET from app.config import URL from app.dashboard.base import dashboard_bp -from app.email_utils import can_be_used_as_personal_email, email_already_used +from app.email_utils import can_be_used_as_personal_email from app.email_utils import mailbox_already_used, render, send_email from app.extensions import db from app.log import LOG from app.models import Alias, DeletedAlias from app.models import Mailbox from app.pgp_utils import PGPException, load_public_key -from smtplib import SMTPRecipientsRefused class ChangeEmailForm(FlaskForm): diff --git a/app/dashboard/views/referral.py b/app/dashboard/views/referral.py index ada99016..f9aedfa0 100644 --- a/app/dashboard/views/referral.py +++ b/app/dashboard/views/referral.py @@ -4,7 +4,7 @@ from flask_login import login_required, current_user from app.dashboard.base import dashboard_bp from app.extensions import db from app.log import LOG -from app.models import EmailLog, Referral +from app.models import Referral from app.utils import random_string diff --git a/app/developer/views/new_client.py b/app/developer/views/new_client.py index 021ba644..53c06036 100644 --- a/app/developer/views/new_client.py +++ b/app/developer/views/new_client.py @@ -3,10 +3,8 @@ from flask_login import current_user, login_required from flask_wtf import FlaskForm from wtforms import StringField, validators -from app import email_utils from app.developer.base import developer_bp from app.extensions import db -from app.log import LOG from app.models import Client diff --git a/app/models.py b/app/models.py index c5d329e5..03ecbc1b 100644 --- a/app/models.py +++ b/app/models.py @@ -1,7 +1,7 @@ import enum import random import uuid -from email.utils import parseaddr, formataddr +from email.utils import formataddr import arrow import bcrypt diff --git a/app/oauth/views/authorize.py b/app/oauth/views/authorize.py index 333b0f0d..740b20bc 100644 --- a/app/oauth/views/authorize.py +++ b/app/oauth/views/authorize.py @@ -28,7 +28,7 @@ from app.oauth_models import ( SUPPORTED_OPENID_FLOWS_STR, response_types_to_str, ) -from app.utils import random_string, encode_url, convert_to_id, random_word +from app.utils import random_string, encode_url, random_word @oauth_bp.route("/authorize", methods=["GET", "POST"]) diff --git a/app/s3.py b/app/s3.py index dd09bbf1..e4443ed8 100644 --- a/app/s3.py +++ b/app/s3.py @@ -1,5 +1,5 @@ -from io import BytesIO import os +from io import BytesIO import boto3 import requests From 36aee86590beae0f43b9c9dd98363305209c8103 Mon Sep 17 00:00:00 2001 From: Son NK Date: Sat, 25 Apr 2020 12:46:20 +0200 Subject: [PATCH 08/11] support sorting: Oldest Alias to Newest, --- app/api/serializer.py | 26 +++++++++++++------- app/dashboard/templates/dashboard/index.html | 17 ++++++++++--- app/dashboard/views/index.py | 5 +++- 3 files changed, 35 insertions(+), 13 deletions(-) diff --git a/app/api/serializer.py b/app/api/serializer.py index 0a9d34a1..f02c4dc8 100644 --- a/app/api/serializer.py +++ b/app/api/serializer.py @@ -109,7 +109,9 @@ def get_alias_infos_with_pagination(user, page_id=0, query=None) -> [AliasInfo]: return ret -def get_alias_infos_with_pagination_v2(user, page_id=0, query=None) -> [AliasInfo]: +def get_alias_infos_with_pagination_v2( + user, page_id=0, query=None, sort=None +) -> [AliasInfo]: ret = [] latest_activity = func.max( case( @@ -122,13 +124,11 @@ def get_alias_infos_with_pagination_v2(user, page_id=0, query=None) -> [AliasInf ).label("latest") q = ( - db.session.query(Alias, latest_activity) - .options(joinedload(Alias.mailbox)) + db.session.query(Alias, Mailbox, latest_activity) .join(Contact, Alias.id == Contact.alias_id, isouter=True) .join(EmailLog, Contact.id == EmailLog.contact_id, isouter=True) .filter(Alias.user_id == user.id) - .group_by(Alias.id) - .order_by(latest_activity.desc()) + .filter(Alias.mailbox_id == Mailbox.id) ) if query: @@ -136,10 +136,18 @@ def get_alias_infos_with_pagination_v2(user, page_id=0, query=None) -> [AliasInf or_(Alias.email.ilike(f"%{query}%"), Alias.note.ilike(f"%{query}%")) ) + if sort == "old2new": + q = q.order_by(Alias.created_at) + else: + # default sorting + q = q.order_by(latest_activity.desc()) + + q = q.group_by(Alias.id, Mailbox.id) + q = q.limit(PAGE_LIMIT).offset(page_id * PAGE_LIMIT) - for alias, latest_activity in q: - ret.append(get_alias_info_v2(alias)) + for alias, mailbox, latest_activity in q: + ret.append(get_alias_info_v2(alias, mailbox)) return ret @@ -166,7 +174,7 @@ def get_alias_info(alias: Alias) -> AliasInfo: return alias_info -def get_alias_info_v2(alias: Alias) -> AliasInfo: +def get_alias_info_v2(alias: Alias, mailbox) -> AliasInfo: q = ( db.session.query(Contact, EmailLog) .filter(Contact.alias_id == alias.id) @@ -178,7 +186,7 @@ def get_alias_info_v2(alias: Alias) -> AliasInfo: latest_contact = None alias_info = AliasInfo( - alias=alias, nb_blocked=0, nb_forward=0, nb_reply=0, mailbox=alias.mailbox + alias=alias, nb_blocked=0, nb_forward=0, nb_reply=0, mailbox=mailbox ) for contact, email_log in q: diff --git a/app/dashboard/templates/dashboard/index.html b/app/dashboard/templates/dashboard/index.html index f6aa8fa8..2d03b940 100644 --- a/app/dashboard/templates/dashboard/index.html +++ b/app/dashboard/templates/dashboard/index.html @@ -63,8 +63,19 @@
+ +
@@ -286,11 +297,11 @@
  • Previous + href="{{ url_for('dashboard.index', page=page-1, query=query, sort=sort) }}">Previous
  • Next + href="{{ url_for('dashboard.index', page=page+1, query=query, sort=sort) }}">Next
diff --git a/app/dashboard/views/index.py b/app/dashboard/views/index.py index ca5c1941..520d5d8e 100644 --- a/app/dashboard/views/index.py +++ b/app/dashboard/views/index.py @@ -21,6 +21,8 @@ from app.models import ( @login_required def index(): query = request.args.get("query") or "" + sort = request.args.get("sort") or "" + page = 0 if request.args.get("page"): page = int(request.args.get("page")) @@ -169,11 +171,12 @@ def index(): return render_template( "dashboard/index.html", client_users=client_users, - alias_infos=get_alias_infos_with_pagination_v2(current_user, page, query), + alias_infos=get_alias_infos_with_pagination_v2(current_user, page, query, sort), highlight_alias_id=highlight_alias_id, query=query, AliasGeneratorEnum=AliasGeneratorEnum, mailboxes=mailboxes, show_intro=show_intro, page=page, + sort=sort, ) From 203eba9917050cf0900b28ec32486302ca90cda5 Mon Sep 17 00:00:00 2001 From: Son NK Date: Sat, 25 Apr 2020 12:58:44 +0200 Subject: [PATCH 09/11] use Ajax for save note --- app/dashboard/templates/dashboard/index.html | 38 ++++++++++++++++++-- 1 file changed, 35 insertions(+), 3 deletions(-) diff --git a/app/dashboard/templates/dashboard/index.html b/app/dashboard/templates/dashboard/index.html index 2d03b940..0680c5bd 100644 --- a/app/dashboard/templates/dashboard/index.html +++ b/app/dashboard/templates/dashboard/index.html @@ -253,6 +253,7 @@