From 723bb0816aebcce04f96823b47e9193caf4bbf43 Mon Sep 17 00:00:00 2001
From: asaki222 <asaki444@gmail.com>
Date: Mon, 4 Nov 2024 09:05:34 -0500
Subject: [PATCH] changes

---
 src/registrar/config/urls.py                 |  6 ++--
 src/registrar/templates/domain_users.html    |  2 +-
 src/registrar/templatetags/custom_filters.py |  2 +-
 src/registrar/views/__init__.py              |  1 -
 src/registrar/views/domain.py                | 34 ++++++++++----------
 5 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/src/registrar/config/urls.py b/src/registrar/config/urls.py
index f61e31e54..869ef9e74 100644
--- a/src/registrar/config/urls.py
+++ b/src/registrar/config/urls.py
@@ -321,9 +321,9 @@ urlpatterns = [
         name="user-profile",
     ),
     path(
-        "invitation/<int:pk>/delete",
-        views.DomainInvitationDeleteView.as_view(http_method_names=["post"]),
-        name="invitation-delete",
+        "invitation/<int:pk>/cancel",
+        views.DomainInvitationCancelView.as_view(http_method_names=["post"]),
+        name="invitation-cancel",
     ),
     path(
         "domain-request/<int:pk>/delete",
diff --git a/src/registrar/templates/domain_users.html b/src/registrar/templates/domain_users.html
index a2eb3e604..c19c9bf69 100644
--- a/src/registrar/templates/domain_users.html
+++ b/src/registrar/templates/domain_users.html
@@ -134,7 +134,7 @@
           <td data-label="Status">{{ invitation.status|title }}</td>
           <td>
             {% if invitation.status == invitation.DomainInvitationStatus.INVITED %}
-            <form method="POST" action="{% url "invitation-delete" pk=invitation.id %}">
+            <form method="POST" action="{% url "invitation-cancel" pk=invitation.id %}">
               {% csrf_token %}<input type="submit" class="usa-button--unstyled text-no-underline cursor-pointer" value="Cancel">
             </form>
             {% endif %}
diff --git a/src/registrar/templatetags/custom_filters.py b/src/registrar/templatetags/custom_filters.py
index b29dccb08..2ace00576 100644
--- a/src/registrar/templatetags/custom_filters.py
+++ b/src/registrar/templatetags/custom_filters.py
@@ -200,7 +200,7 @@ def is_domain_subpage(path):
         "domain-users-add",
         "domain-request-delete",
         "domain-user-delete",
-        "invitation-delete",
+        "invitation-cancel",
     ]
     return get_url_name(path) in url_names
 
diff --git a/src/registrar/views/__init__.py b/src/registrar/views/__init__.py
index 6b3bcac7c..9a9cb7856 100644
--- a/src/registrar/views/__init__.py
+++ b/src/registrar/views/__init__.py
@@ -11,7 +11,6 @@ from .domain import (
     DomainSecurityEmailView,
     DomainUsersView,
     DomainAddUserView,
-    DomainInvitationDeleteView,
     DomainInvitationCancelView,
     DomainDeleteUserView,
 )
diff --git a/src/registrar/views/domain.py b/src/registrar/views/domain.py
index d437bce5a..ab368b614 100644
--- a/src/registrar/views/domain.py
+++ b/src/registrar/views/domain.py
@@ -1054,26 +1054,26 @@ class DomainAddUserView(DomainFormBaseView):
 # # The order of the superclasses matters here. BaseDeleteView has a bug where the
 # # "form_valid" function does not call super, so it cannot use SuccessMessageMixin.
 # # The workaround is to use SuccessMessageMixin first.
-class DomainInvitationDeleteView(SuccessMessageMixin, DomainInvitationPermissionDeleteView):
-    object: DomainInvitation  # workaround for type mismatch in DeleteView
+# class DomainInvitationDeleteView(SuccessMessageMixin, DomainInvitationPermissionDeleteView):
+#     object: DomainInvitation  # workaround for type mismatch in DeleteView
 
-    def post(self, request, *args, **kwargs):
-        """Override post method in order to error in the case when the
-        domain invitation status is RETRIEVED"""
-        self.object = self.get_object()
-        form = self.get_form()
-        if form.is_valid() and self.object.status == self.object.DomainInvitationStatus.INVITED:
-            return self.form_valid(form)
-        else:
-            # Produce an error message if the domain invatation status is RETRIEVED
-            messages.error(request, f"Invitation to {self.object.email} has already been retrieved.")
-            return HttpResponseRedirect(self.get_success_url())
+#     def post(self, request, *args, **kwargs):
+#         """Override post method in order to error in the case when the
+#         domain invitation status is RETRIEVED"""
+#         self.object = self.get_object()
+#         form = self.get_form()
+#         if form.is_valid() and self.object.status == self.object.DomainInvitationStatus.INVITED:
+#             return self.form_valid(form)
+#         else:
+#             # Produce an error message if the domain invatation status is RETRIEVED
+#             messages.error(request, f"Invitation to {self.object.email} has already been retrieved.")
+#             return HttpResponseRedirect(self.get_success_url())
 
-    def get_success_url(self):
-        return reverse("domain-users", kwargs={"pk": self.object.domain.id})
+#     def get_success_url(self):
+#         return reverse("domain-users", kwargs={"pk": self.object.domain.id})
 
-    def get_success_message(self, cleaned_data):
-        return f"Canceled invitation to {self.object.email}."
+#     def get_success_message(self, cleaned_data):
+#         return f"Canceled invitation to {self.object.email}."
     
 
 class DomainInvitationCancelView(SuccessMessageMixin, DomainInvitationUpdateView):