small cleanup

src/registrar/models/domain_request.py

@@ -50,25 +50,11 @@ class DomainRequest(TimeStampedModel):
         def get_status_label(cls, status_name: str):
             """Returns the associated label for a given status name"""
             return cls(status_name).label if status_name else None
-        
+
         @classmethod
         def statuses_awaiting_review(cls):
             """Returns all statuses that are awaiting a review from analysts"""
-            return [
+            return [cls.SUBMITTED, cls.IN_REVIEW]
-                cls.SUBMITTED,
-                cls.IN_REVIEW
-            ]
-        
-        # TODO - a better approach might be to just grab the value of source?
-        # How??
-        @classmethod
-        def withdrawable_statuses(cls):
-            """Returns all statuses that are withdrawable"""
-            return [
-                cls.SUBMITTED,
-                cls.IN_REVIEW, 
-                cls.ACTION_NEEDED
-            ]
 
     class StateTerritoryChoices(models.TextChoices):
         ALABAMA = "AL", "Alabama (AL)"
@@ -606,10 +592,6 @@ class DomainRequest(TimeStampedModel):
         """Checks if the current status is in submitted or in_review"""
         return self.status in DomainRequest.DomainRequestStatus.statuses_awaiting_review()
 
-    def is_withdrawable(self):
-        """Helper function that determines if the request can be withdrawn in its current status"""
-        return self.status in DomainRequest.DomainRequestStatus.withdrawable_statuses()
-
     def get_first_status_set_date(self, status):
         """Returns the date when the domain request was first set to the given status."""
         log_entry = (
@@ -1028,6 +1010,17 @@ class DomainRequest(TimeStampedModel):
             send_email=send_email,
         )
 
+    def is_withdrawable(self):
+        """Helper function that determines if the request can be withdrawn in its current status"""
+        # This list is equivalent to the source field on withdraw. We need a better way to
+        # consolidate these two lists - i.e. some sort of method that keeps these two lists in sync.
+        # django fsm is very picky with what we can define in that field.
+        return self.status in [
+            self.DomainRequestStatus.SUBMITTED,
+            self.DomainRequestStatus.IN_REVIEW,
+            self.DomainRequestStatus.ACTION_NEEDED,
+        ]
+
     @transition(
         field="status",
         source=[DomainRequestStatus.SUBMITTED, DomainRequestStatus.IN_REVIEW, DomainRequestStatus.ACTION_NEEDED],

src/registrar/tests/test_views_requests_json.py

@@ -341,7 +341,9 @@ class GetRequestsJsonTest(TestWithUser, WebTest):
             if creator[i] != self.user.email:
                 # Test case where action is View
                 self.assertEqual("View", action_labels[i])
-                self.assertEqual("#", action_urls[i])
+                self.assertEqual(
+                    reverse("domain-request-status-viewonly", kwargs={"pk": expected_domain_request.id}), action_urls[i]
+                )
                 self.assertEqual("visibility", svg_icons[i])
             elif status[i] in [
                 DomainRequest.DomainRequestStatus.STARTED.label,

src/registrar/views/domain_request.py

@@ -758,7 +758,7 @@ class DomainRequestStatus(DomainRequestPermissionView):
         has_base_perms = super().has_permission()
         if not has_base_perms:
             return False
-        
+
         if self.request.user.is_org_user(self.request):
             portfolio = self.request.session.get("portfolio")
             if not self.request.user.has_edit_request_portfolio_permission(portfolio):