forked from rapidpro/rapidpro
-
Notifications
You must be signed in to change notification settings - Fork 24
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #5587 from nyaruka/contact_list_cleanup
Cleanup contact list pages and reduce db hits
- Loading branch information
Showing
11 changed files
with
199 additions
and
335 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,49 +1,65 @@ | ||
from temba.contacts.models import ContactField | ||
from temba.tests import TembaTest | ||
|
||
from .contacts import format_urn, name_or_urn, urn_icon, urn_or_anon | ||
from . import contacts as tags | ||
|
||
|
||
class ContactsTest(TembaTest): | ||
def test_contact_field(self): | ||
gender = self.create_field("gender", "Gender", ContactField.TYPE_TEXT) | ||
age = self.create_field("age", "Age", ContactField.TYPE_NUMBER) | ||
joined = self.create_field("joined", "Joined", ContactField.TYPE_DATETIME) | ||
last_seen_on = self.org.fields.get(key="last_seen_on") | ||
contact = self.create_contact("Bob", fields={"age": 30, "gender": "M", "joined": "2024-01-01T00:00:00Z"}) | ||
|
||
self.assertEqual("M", tags.contact_field(contact, gender)) | ||
self.assertEqual("30", tags.contact_field(contact, age)) | ||
self.assertEqual( | ||
"<temba-date value='2024-01-01T02:00:00+02:00' display='date'></temba-date>", | ||
tags.contact_field(contact, joined), | ||
) | ||
self.assertEqual("--", tags.contact_field(contact, last_seen_on)) | ||
|
||
def test_name_or_urn(self): | ||
contact1 = self.create_contact("", urns=[]) | ||
contact2 = self.create_contact("Ann", urns=[]) | ||
contact3 = self.create_contact("Bob", urns=["tel:+12024561111", "telegram:098761111"]) | ||
contact4 = self.create_contact("", urns=["tel:+12024562222", "telegram:098762222"]) | ||
|
||
self.assertEqual("", name_or_urn(contact1, self.org)) | ||
self.assertEqual("Ann", name_or_urn(contact2, self.org)) | ||
self.assertEqual("Bob", name_or_urn(contact3, self.org)) | ||
self.assertEqual("(202) 456-2222", name_or_urn(contact4, self.org)) | ||
self.assertEqual("", tags.name_or_urn(contact1, self.org)) | ||
self.assertEqual("Ann", tags.name_or_urn(contact2, self.org)) | ||
self.assertEqual("Bob", tags.name_or_urn(contact3, self.org)) | ||
self.assertEqual("(202) 456-2222", tags.name_or_urn(contact4, self.org)) | ||
|
||
with self.anonymous(self.org): | ||
self.assertEqual(f"{contact1.id:010}", name_or_urn(contact1, self.org)) | ||
self.assertEqual("Ann", name_or_urn(contact2, self.org)) | ||
self.assertEqual("Bob", name_or_urn(contact3, self.org)) | ||
self.assertEqual(f"{contact4.id:010}", name_or_urn(contact4, self.org)) | ||
self.assertEqual(f"{contact1.id:010}", tags.name_or_urn(contact1, self.org)) | ||
self.assertEqual("Ann", tags.name_or_urn(contact2, self.org)) | ||
self.assertEqual("Bob", tags.name_or_urn(contact3, self.org)) | ||
self.assertEqual(f"{contact4.id:010}", tags.name_or_urn(contact4, self.org)) | ||
|
||
def test_urn_or_anon(self): | ||
contact1 = self.create_contact("Bob", urns=[]) | ||
contact2 = self.create_contact("Uri", urns=["tel:+12024561414", "telegram:098765432"]) | ||
|
||
self.assertEqual("--", urn_or_anon(contact1, self.org)) | ||
self.assertEqual("+1 202-456-1414", urn_or_anon(contact2, self.org)) | ||
self.assertEqual("--", tags.urn_or_anon(contact1, self.org)) | ||
self.assertEqual("+1 202-456-1414", tags.urn_or_anon(contact2, self.org)) | ||
|
||
with self.anonymous(self.org): | ||
self.assertEqual(f"{contact1.id:010}", urn_or_anon(contact1, self.org)) | ||
self.assertEqual(f"{contact2.id:010}", urn_or_anon(contact2, self.org)) | ||
self.assertEqual(f"{contact1.id:010}", tags.urn_or_anon(contact1, self.org)) | ||
self.assertEqual(f"{contact2.id:010}", tags.urn_or_anon(contact2, self.org)) | ||
|
||
def test_urn_icon(self): | ||
contact = self.create_contact("Uri", urns=["tel:+1234567890", "telegram:098765432", "viber:346376373"]) | ||
tel_urn, tg_urn, viber_urn = contact.urns.order_by("-priority") | ||
|
||
self.assertEqual("icon-phone", urn_icon(tel_urn)) | ||
self.assertEqual("icon-telegram", urn_icon(tg_urn)) | ||
self.assertEqual("", urn_icon(viber_urn)) | ||
self.assertEqual("icon-phone", tags.urn_icon(tel_urn)) | ||
self.assertEqual("icon-telegram", tags.urn_icon(tg_urn)) | ||
self.assertEqual("", tags.urn_icon(viber_urn)) | ||
|
||
def test_format_urn(self): | ||
contact = self.create_contact("Uri", urns=["tel:+12024561414"]) | ||
|
||
self.assertEqual("+1 202-456-1414", format_urn(contact.get_urn(), self.org)) | ||
self.assertEqual("+1 202-456-1414", tags.format_urn(contact.get_urn(), self.org)) | ||
|
||
with self.anonymous(self.org): | ||
self.assertEqual("••••••••", format_urn(contact.get_urn(), self.org)) | ||
self.assertEqual("••••••••", tags.format_urn(contact.get_urn(), self.org)) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
{% extends "contacts/contact_list.html" %} | ||
{% load i18n %} | ||
|
||
{% block subtitle %} | ||
{% trans "These contacts have been removed from all groups and can be deleted permanently." %} | ||
{% endblock subtitle %} | ||
{% block pre-table %} | ||
<div class="mb-4">{% trans "These contacts have been removed from all groups and can be deleted permanently." %}</div> | ||
{% endblock pre-table %} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
{% extends "contacts/contact_list.html" %} | ||
{% load i18n %} | ||
|
||
{% block subtitle %} | ||
{% trans "All inbound messages from these contacts are ignored. They have also been removed from all groups." %} | ||
{% endblock subtitle %} | ||
{% block pre-table %} | ||
<div class="mb-4">{% trans "All inbound messages from these contacts are ignored. They have also been removed from all groups." %}</div> | ||
{% endblock pre-table %} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
{% extends "contacts/contact_list.html" %} | ||
{% load smartmin i18n %} | ||
|
||
{% block subtitle %} | ||
{% if current_group.is_smart %}<div class="font-mono text-sm mt-2 bg-gray-200 text-gray-700 p-3 rounded-lg">{{ current_group.query }}</div>{% endif %} | ||
{% endblock subtitle %} | ||
{% block pre-table %} | ||
{% if current_group.is_smart %}<div class="mb-4 font-mono text-sm mt-2 bg-gray-200 text-gray-700 p-3 rounded-lg">{{ current_group.query }}</div>{% endif %} | ||
{% endblock pre-table %} |
Oops, something went wrong.