From 41295a11b355971de962c03c667c78b128c46019 Mon Sep 17 00:00:00 2001
From: Balamurali M <balamurali@frappe.io>
Date: Fri, 6 Oct 2023 19:30:46 +0530
Subject: [PATCH] fix(Site): Simpler conditions for Activate btn to show on
 Pending site

---
 dashboard/src/views/site/Site.vue |  2 +-
 press/api/site.py                 |  5 ++---
 press/api/tests/test_site.py      |  2 +-
 press/press/doctype/site/site.py  | 20 ++++++--------------
 4 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/dashboard/src/views/site/Site.vue b/dashboard/src/views/site/Site.vue
index 7679f82ac8..70d31a6ac5 100644
--- a/dashboard/src/views/site/Site.vue
+++ b/dashboard/src/views/site/Site.vue
@@ -54,7 +54,7 @@
 				</div>
 				<Button
 					@click="onActivateClick"
-					v-if="site.last_job_undelivered_for_long"
+					v-if="site.pending_for_long"
 					:variant="'solid'"
 					class="mr-1"
 				>
diff --git a/press/api/site.py b/press/api/site.py
index e19ac22f9e..412bc32d15 100644
--- a/press/api/site.py
+++ b/press/api/site.py
@@ -835,9 +835,7 @@ def get(name):
 			)[0],
 			"auto_updates_enabled": not site.skip_auto_updates,
 		},
-		"last_job_undelivered_for_long": site.last_job_undelivered_for_long
-		if site.status == "Pending"
-		else False,
+		"pending_for_long": site.pending_for_long,
 	}
 
 
@@ -1007,6 +1005,7 @@ def get_server_region_info(site) -> Dict:
 @protected("Site")
 def available_apps(name):
 	site = frappe.get_doc("Site", name)
+
 	installed_apps = [app.app for app in site.apps]
 
 	bench = frappe.get_doc("Bench", site.bench)
diff --git a/press/api/tests/test_site.py b/press/api/tests/test_site.py
index fdd922dedb..9ec79459d4 100644
--- a/press/api/tests/test_site.py
+++ b/press/api/tests/test_site.py
@@ -140,7 +140,7 @@ def test_get_fn_returns_site_details(self):
 					{"team": self.team.name, "doctype_name": "Site"},
 					["name", "tag"],
 				),
-				"last_job_undelivered_for_long": False,
+				"pending_for_long": False,
 			},
 			site_details,
 		)
diff --git a/press/press/doctype/site/site.py b/press/press/doctype/site/site.py
index 4925c8c6a1..1329535dc0 100644
--- a/press/press/doctype/site/site.py
+++ b/press/press/doctype/site/site.py
@@ -1315,20 +1315,12 @@ def disable_read_write(self):
 		self.enable_database_access("read_only")
 
 	@property
-	def last_job_undelivered_for_long(self) -> bool:
-		last_jobs = frappe.get_all(
-			"Agent Job",
-			["modified", "status"],
-			filters={"site": self.name},
-			order_by="creation desc",
-			limit=2,  # for pair jobs like Archive Site
-		)
-		for job in last_jobs:
-			if (
-				job.status == "Undelivered"
-				and (frappe.utils.now_datetime() - job.modified).total_seconds() > 60 * 60 * 4
-			):
-				return True
+	def pending_for_long(self) -> bool:
+		if not self.status == "Pending":
+			return False
+		return (
+			frappe.utils.now_datetime() - self.modified
+		).total_seconds() > 60 * 60 * 4  # 4 hours
 
 
 def site_cleanup_after_archive(site):