-An “invited” status indicates that the recipient has not logged in to the registrar since the invitation was sent. -A “received” status indicates that the recipient has logged in. +An “invited” status indicates that the recipient has not logged in to the registrar since the invitation was sent. Deleting an invitation with an "invited" status will prevent the user from signing in. +A “received” status indicates that the recipient has logged in. Deleting an invitation with a "received" status will not revoke that user's access from the domain. To remove a user who has already signed in, go to User domain roles and delete the role for the correct domain/manager combination.
diff --git a/src/registrar/templates/includes/domain_requests_table.html b/src/registrar/templates/includes/domain_requests_table.html
index efebd1e28..ad91699ef 100644
--- a/src/registrar/templates/includes/domain_requests_table.html
+++ b/src/registrar/templates/includes/domain_requests_table.html
@@ -2,7 +2,6 @@
Domain requests
diff --git a/src/registrar/templates/includes/domains_table.html b/src/registrar/templates/includes/domains_table.html
index 309702d26..348ab21d7 100644
--- a/src/registrar/templates/includes/domains_table.html
+++ b/src/registrar/templates/includes/domains_table.html
@@ -1,11 +1,13 @@
{% load static %}
Domains
-
+ Domains
+
+ {% else %}
+
+
{% endif %}
Domain name
Expires
Status
-
{% if portfolio %}
Suborganization
{% endif %}
diff --git a/src/registrar/tests/test_admin.py b/src/registrar/tests/test_admin.py
index 7db18f293..9eeaf1577 100644
--- a/src/registrar/tests/test_admin.py
+++ b/src/registrar/tests/test_admin.py
@@ -164,7 +164,7 @@ class TestDomainInvitationAdmin(TestCase):
)
# Assert that the filters are added
- self.assertContains(response, "invited", count=4)
+ self.assertContains(response, "invited", count=5)
self.assertContains(response, "Invited", count=2)
self.assertContains(response, "retrieved", count=2)
self.assertContains(response, "Retrieved", count=2)
diff --git a/src/registrar/tests/test_models.py b/src/registrar/tests/test_models.py
index 741ec5361..5982d89b9 100644
--- a/src/registrar/tests/test_models.py
+++ b/src/registrar/tests/test_models.py
@@ -1292,7 +1292,6 @@ class TestUser(TestCase):
1. Returns False when a user does not have a portfolio
2. Returns True when user has direct permission
3. Returns True when user has permission through a role
- 4. Returns True EDIT_DOMAINS when user does not have the perm but has UserDomainRole
Note: This tests _get_portfolio_permissions as a side effect
"""
@@ -1304,11 +1303,9 @@ class TestUser(TestCase):
user_can_view_all_domains = self.user.has_domains_portfolio_permission()
user_can_view_all_requests = self.user.has_domain_requests_portfolio_permission()
- user_can_edit_domains = self.user.has_edit_domains_portfolio_permission()
self.assertFalse(user_can_view_all_domains)
self.assertFalse(user_can_view_all_requests)
- self.assertFalse(user_can_edit_domains)
self.user.portfolio = portfolio
self.user.save()
@@ -1316,11 +1313,9 @@ class TestUser(TestCase):
user_can_view_all_domains = self.user.has_domains_portfolio_permission()
user_can_view_all_requests = self.user.has_domain_requests_portfolio_permission()
- user_can_edit_domains = self.user.has_edit_domains_portfolio_permission()
self.assertTrue(user_can_view_all_domains)
self.assertFalse(user_can_view_all_requests)
- self.assertFalse(user_can_edit_domains)
self.user.portfolio_roles = [User.UserPortfolioRoleChoices.ORGANIZATION_ADMIN]
self.user.save()
@@ -1328,11 +1323,9 @@ class TestUser(TestCase):
user_can_view_all_domains = self.user.has_domains_portfolio_permission()
user_can_view_all_requests = self.user.has_domain_requests_portfolio_permission()
- user_can_edit_domains = self.user.has_edit_domains_portfolio_permission()
self.assertTrue(user_can_view_all_domains)
self.assertTrue(user_can_view_all_requests)
- self.assertFalse(user_can_edit_domains)
UserDomainRole.objects.all().get_or_create(
user=self.user, domain=self.domain, role=UserDomainRole.Roles.MANAGER
@@ -1340,11 +1333,9 @@ class TestUser(TestCase):
user_can_view_all_domains = self.user.has_domains_portfolio_permission()
user_can_view_all_requests = self.user.has_domain_requests_portfolio_permission()
- user_can_edit_domains = self.user.has_edit_domains_portfolio_permission()
self.assertTrue(user_can_view_all_domains)
self.assertTrue(user_can_view_all_requests)
- self.assertTrue(user_can_edit_domains)
Portfolio.objects.all().delete()
diff --git a/src/registrar/tests/test_views_domains_json.py b/src/registrar/tests/test_views_domains_json.py
index 18d6415a0..09a233768 100644
--- a/src/registrar/tests/test_views_domains_json.py
+++ b/src/registrar/tests/test_views_domains_json.py
@@ -1,4 +1,4 @@
-from registrar.models import UserDomainRole, Domain
+from registrar.models import UserDomainRole, Domain, DomainInformation, Portfolio
from django.urls import reverse
from .test_views import TestWithUser
from django_webtest import WebTest # type: ignore
@@ -15,15 +15,25 @@ class GetDomainsJsonTest(TestWithUser, WebTest):
self.domain1 = Domain.objects.create(name="example1.com", expiration_date="2024-01-01", state="unknown")
self.domain2 = Domain.objects.create(name="example2.com", expiration_date="2024-02-01", state="dns needed")
self.domain3 = Domain.objects.create(name="example3.com", expiration_date="2024-03-01", state="ready")
+ self.domain4 = Domain.objects.create(name="example4.com", expiration_date="2024-03-01", state="ready")
# Create UserDomainRoles
UserDomainRole.objects.create(user=self.user, domain=self.domain1)
UserDomainRole.objects.create(user=self.user, domain=self.domain2)
UserDomainRole.objects.create(user=self.user, domain=self.domain3)
+ # Create Portfolio
+ self.portfolio = Portfolio.objects.create(creator=self.user, organization_name="Example org")
+
+ # Add domain3 and domain4 to portfolio
+ DomainInformation.objects.create(creator=self.user, domain=self.domain3, portfolio=self.portfolio)
+ DomainInformation.objects.create(creator=self.user, domain=self.domain4, portfolio=self.portfolio)
+
def tearDown(self):
- super().tearDown()
UserDomainRole.objects.all().delete()
+ DomainInformation.objects.all().delete()
+ Portfolio.objects.all().delete()
+ super().tearDown()
@less_console_noise_decorator
def test_get_domains_json_unauthenticated(self):
@@ -104,6 +114,82 @@ class GetDomainsJsonTest(TestWithUser, WebTest):
)
self.assertEqual(svg_icon_expected, svg_icons[i])
+ @less_console_noise_decorator
+ def test_get_domains_json_with_portfolio(self):
+ """Test that an authenticated user gets the list of 2 domains for portfolio."""
+
+ response = self.app.get(reverse("get_domains_json"), {"portfolio": self.portfolio.id})
+ self.assertEqual(response.status_code, 200)
+ data = response.json
+
+ # Check pagination info
+ self.assertEqual(data["page"], 1)
+ self.assertFalse(data["has_next"])
+ self.assertFalse(data["has_previous"])
+ self.assertEqual(data["num_pages"], 1)
+
+ # Check the number of domains
+ self.assertEqual(len(data["domains"]), 2)
+
+ # Expected domains
+ expected_domains = [self.domain3, self.domain4]
+
+ # Extract fields from response
+ domain_ids = [domain["id"] for domain in data["domains"]]
+ names = [domain["name"] for domain in data["domains"]]
+ expiration_dates = [domain["expiration_date"] for domain in data["domains"]]
+ states = [domain["state"] for domain in data["domains"]]
+ state_displays = [domain["state_display"] for domain in data["domains"]]
+ get_state_help_texts = [domain["get_state_help_text"] for domain in data["domains"]]
+ action_urls = [domain["action_url"] for domain in data["domains"]]
+ action_labels = [domain["action_label"] for domain in data["domains"]]
+ svg_icons = [domain["svg_icon"] for domain in data["domains"]]
+
+ # Check fields for each domain
+ for i, expected_domain in enumerate(expected_domains):
+ self.assertEqual(expected_domain.id, domain_ids[i])
+ self.assertEqual(expected_domain.name, names[i])
+ self.assertEqual(expected_domain.expiration_date, expiration_dates[i])
+ self.assertEqual(expected_domain.state, states[i])
+
+ # Parsing the expiration date from string to date
+ parsed_expiration_date = parse_date(expiration_dates[i])
+ expected_domain.expiration_date = parsed_expiration_date
+
+ # Check state_display and get_state_help_text
+ self.assertEqual(expected_domain.state_display(), state_displays[i])
+ self.assertEqual(expected_domain.get_state_help_text(), get_state_help_texts[i])
+
+ self.assertEqual(reverse("domain", kwargs={"pk": expected_domain.id}), action_urls[i])
+
+ # Check action_label
+ user_domain_role_exists = UserDomainRole.objects.filter(
+ domain_id=expected_domains[i].id, user=self.user
+ ).exists()
+ action_label_expected = (
+ "View"
+ if not user_domain_role_exists
+ or expected_domains[i].state
+ in [
+ Domain.State.DELETED,
+ Domain.State.ON_HOLD,
+ ]
+ else "Manage"
+ )
+ self.assertEqual(action_label_expected, action_labels[i])
+
+ # Check svg_icon
+ svg_icon_expected = (
+ "visibility"
+ if expected_domains[i].state
+ in [
+ Domain.State.DELETED,
+ Domain.State.ON_HOLD,
+ ]
+ else "settings"
+ )
+ self.assertEqual(svg_icon_expected, svg_icons[i])
+
@less_console_noise_decorator
def test_get_domains_json_search(self):
"""Test search."""
diff --git a/src/registrar/utility/csv_export.py b/src/registrar/utility/csv_export.py
index 5fbd255aa..d852df5db 100644
--- a/src/registrar/utility/csv_export.py
+++ b/src/registrar/utility/csv_export.py
@@ -374,8 +374,9 @@ class DomainExport(BaseExport):
if first_ready_on is None:
first_ready_on = "(blank)"
- domain_org_type = model.get("generic_org_type")
- human_readable_domain_org_type = DomainRequest.OrganizationChoices.get_org_label(domain_org_type)
+ # organization_type has generic_org_type AND is_election
+ domain_org_type = model.get("organization_type")
+ human_readable_domain_org_type = DomainRequest.OrgChoicesElectionOffice.get_org_label(domain_org_type)
domain_federal_type = model.get("federal_type")
human_readable_domain_federal_type = BranchChoices.get_branch_label(domain_federal_type)
domain_type = human_readable_domain_org_type
diff --git a/src/registrar/views/domains_json.py b/src/registrar/views/domains_json.py
index 3b3cae2c7..d4c09d808 100644
--- a/src/registrar/views/domains_json.py
+++ b/src/registrar/views/domains_json.py
@@ -6,6 +6,8 @@ from django.contrib.auth.decorators import login_required
from django.urls import reverse
from django.db.models import Q
+from registrar.models.domain_information import DomainInformation
+
logger = logging.getLogger(__name__)
@@ -14,10 +16,9 @@ def get_domains_json(request):
"""Given the current request,
get all domains that are associated with the UserDomainRole object"""
- user_domain_roles = UserDomainRole.objects.filter(user=request.user).select_related("domain_info__sub_organization")
- domain_ids = user_domain_roles.values_list("domain_id", flat=True)
+ domain_ids = get_domain_ids_from_request(request)
- objects = Domain.objects.filter(id__in=domain_ids)
+ objects = Domain.objects.filter(id__in=domain_ids).select_related("domain_info__sub_organization")
unfiltered_total = objects.count()
objects = apply_search(objects, request)
@@ -28,7 +29,7 @@ def get_domains_json(request):
page_number = request.GET.get("page")
page_obj = paginator.get_page(page_number)
- domains = [serialize_domain(domain) for domain in page_obj.object_list]
+ domains = [serialize_domain(domain, request.user) for domain in page_obj.object_list]
return JsonResponse(
{
@@ -43,6 +44,21 @@ def get_domains_json(request):
)
+def get_domain_ids_from_request(request):
+ """Get domain ids from request.
+
+ If portfolio specified, return domain ids associated with portfolio.
+ Otherwise, return domain ids associated with request.user.
+ """
+ portfolio = request.GET.get("portfolio")
+ if portfolio:
+ domain_infos = DomainInformation.objects.filter(portfolio=portfolio)
+ return domain_infos.values_list("domain_id", flat=True)
+ else:
+ user_domain_roles = UserDomainRole.objects.filter(user=request.user)
+ return user_domain_roles.values_list("domain_id", flat=True)
+
+
def apply_search(queryset, request):
search_term = request.GET.get("search_term")
if search_term:
@@ -94,7 +110,7 @@ def apply_sorting(queryset, request):
return queryset.order_by(sort_by)
-def serialize_domain(domain):
+def serialize_domain(domain, user):
suborganization_name = None
try:
domain_info = domain.domain_info
@@ -106,6 +122,9 @@ def serialize_domain(domain):
domain_info = None
logger.debug(f"Issue in domains_json: We could not find domain_info for {domain}")
+ # Check if there is a UserDomainRole for this domain and user
+ user_domain_role_exists = UserDomainRole.objects.filter(domain_id=domain.id, user=user).exists()
+
return {
"id": domain.id,
"name": domain.name,
@@ -114,7 +133,11 @@ def serialize_domain(domain):
"state_display": domain.state_display(),
"get_state_help_text": domain.get_state_help_text(),
"action_url": reverse("domain", kwargs={"pk": domain.id}),
- "action_label": ("View" if domain.state in [Domain.State.DELETED, Domain.State.ON_HOLD] else "Manage"),
+ "action_label": (
+ "View"
+ if not user_domain_role_exists or domain.state in [Domain.State.DELETED, Domain.State.ON_HOLD]
+ else "Manage"
+ ),
"svg_icon": ("visibility" if domain.state in [Domain.State.DELETED, Domain.State.ON_HOLD] else "settings"),
"suborganization": suborganization_name,
}