From 273c98a76792ab8428d267aba300e0add4d184d4 Mon Sep 17 00:00:00 2001
From: Sabu Siyad <hello@ssiyad.com>
Date: Tue, 17 Oct 2023 14:37:34 +0530
Subject: [PATCH 1/4] fix(ux): allow empty sla

---
 desk/src/pages/ticket/TicketDetails.vue       | 43 +++++++++++--------
 .../helpdesk/doctype/hd_ticket/hd_ticket.json |  3 +-
 .../helpdesk/doctype/hd_ticket/hd_ticket.py   | 12 +++++-
 3 files changed, 36 insertions(+), 22 deletions(-)

diff --git a/desk/src/pages/ticket/TicketDetails.vue b/desk/src/pages/ticket/TicketDetails.vue
index 3c99c1d5d..510fb8097 100644
--- a/desk/src/pages/ticket/TicketDetails.vue
+++ b/desk/src/pages/ticket/TicketDetails.vue
@@ -16,26 +16,33 @@
               {{ data.customer }}
             </span>
           </div>
-          <div class="space-y-1.5">
-            <span class="block text-sm text-gray-700">First response</span>
-            <span class="mr-2 font-medium text-gray-900">
+          <div
+            v-if="data.first_responded_on || data.response_by"
+            class="space-y-1.5"
+          >
+            <div class="text-sm text-gray-700">First response</div>
+            <div class="mr-2 inline-block font-medium text-gray-900">
               {{ dayjs(data.first_responded_on || data.response_by).short() }}
+            </div>
+            <span v-if="data.response_by">
+              <Badge
+                v-if="!data.first_responded_on"
+                label="Due"
+                theme="orange"
+                variant="outline"
+              />
+              <Badge
+                v-else-if="
+                  dayjs(data.first_responded_on).isBefore(
+                    dayjs(data.response_by)
+                  )
+                "
+                label="Fulfilled"
+                theme="green"
+                variant="outline"
+              />
+              <Badge v-else label="Failed" theme="red" variant="outline" />
             </span>
-            <Badge
-              v-if="!data.first_responded_on"
-              label="Due"
-              theme="orange"
-              variant="outline"
-            />
-            <Badge
-              v-else-if="
-                dayjs(data.first_responded_on).isBefore(dayjs(data.response_by))
-              "
-              label="Fulfilled"
-              theme="green"
-              variant="outline"
-            />
-            <Badge v-else label="Failed" theme="red" variant="outline" />
           </div>
           <div
             v-if="data.resolution_date || data.resolution_by"
diff --git a/helpdesk/helpdesk/doctype/hd_ticket/hd_ticket.json b/helpdesk/helpdesk/doctype/hd_ticket/hd_ticket.json
index 5ef550489..a02871cb8 100644
--- a/helpdesk/helpdesk/doctype/hd_ticket/hd_ticket.json
+++ b/helpdesk/helpdesk/doctype/hd_ticket/hd_ticket.json
@@ -176,7 +176,6 @@
    "read_only": 1
   },
   {
-   "default": "First Response Due",
    "depends_on": "eval: doc.sla",
    "fieldname": "agreement_status",
    "fieldtype": "Select",
@@ -380,7 +379,7 @@
  "icon": "fa fa-issue",
  "idx": 61,
  "links": [],
- "modified": "2023-10-08 23:24:56.917977",
+ "modified": "2023-10-17 13:34:03.649901",
  "modified_by": "Administrator",
  "module": "Helpdesk",
  "name": "HD Ticket",
diff --git a/helpdesk/helpdesk/doctype/hd_ticket/hd_ticket.py b/helpdesk/helpdesk/doctype/hd_ticket/hd_ticket.py
index 3b8545d56..08bc40a8c 100644
--- a/helpdesk/helpdesk/doctype/hd_ticket/hd_ticket.py
+++ b/helpdesk/helpdesk/doctype/hd_ticket/hd_ticket.py
@@ -713,12 +713,20 @@ def apply_escalation_rule(self):
 		self.assign_agent(escalation_rule.to_agent)
 
 	def set_sla(self):
+		"""
+		Find an SLA to apply to this ticket.
+		"""
 		if sla := get_sla(self):
 			self.sla = sla.name
+		self.sla = None
 
 	def apply_sla(self):
-		sla = frappe.get_doc("HD Service Level Agreement", self.sla)
-		sla.apply(self)
+		"""
+		Apply SLA if set. This won't check whether the SLA exists. Hence, will
+		fail/error if the SLA is deleted.
+		"""
+		if self.sla:
+			frappe.get_doc("HD Service Level Agreement", self.sla).apply(self)
 
 	# `on_communication_update` is a special method exposed from `Communication` doctype.
 	# It is called when a communication is updated. Beware of changes as this effectively

From 633c9a184e9560c02935e4920f6769ba59cde78a Mon Sep 17 00:00:00 2001
From: Sabu Siyad <hello@ssiyad.com>
Date: Tue, 17 Oct 2023 14:42:28 +0530
Subject: [PATCH 2/4] fix(ux): allow deleting default sla

---
 .../hd_service_level_agreement/hd_service_level_agreement.py | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/helpdesk/helpdesk/doctype/hd_service_level_agreement/hd_service_level_agreement.py b/helpdesk/helpdesk/doctype/hd_service_level_agreement/hd_service_level_agreement.py
index 17284bcc7..88b17b50c 100644
--- a/helpdesk/helpdesk/doctype/hd_service_level_agreement/hd_service_level_agreement.py
+++ b/helpdesk/helpdesk/doctype/hd_service_level_agreement/hd_service_level_agreement.py
@@ -116,11 +116,6 @@ def get_hd_service_level_agreement_priority(self, priority):
 			}
 		)
 
-	def on_trash(self):
-		if self.service_level == "Default":
-			text = _("The Default HD Service Level Agreement cannot be deleted")
-			frappe.throw(text, frappe.PermissionError)
-
 	def apply(self, doc: Document):
 		self.handle_new(doc)
 		self.handle_status(doc)

From 079036fd9bca3af0edd79c5a2f624ef69bab212b Mon Sep 17 00:00:00 2001
From: Sabu Siyad <hello@ssiyad.com>
Date: Tue, 17 Oct 2023 16:22:07 +0530
Subject: [PATCH 3/4] fix: agreement status: remove default

---
 desk/src/pages/tickets/TicketsAgentList.vue        | 1 +
 helpdesk/helpdesk/doctype/hd_ticket/hd_ticket.json | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/desk/src/pages/tickets/TicketsAgentList.vue b/desk/src/pages/tickets/TicketsAgentList.vue
index 3d59ecc14..6ae262406 100644
--- a/desk/src/pages/tickets/TicketsAgentList.vue
+++ b/desk/src/pages/tickets/TicketsAgentList.vue
@@ -34,6 +34,7 @@
     </template>
     <template #agreement_status="{ data }">
       <Badge
+        v-if="data.agreement_status"
         :label="data.agreement_status"
         :theme="slaStatusColorMap[data.agreement_status]"
         variant="outline"
diff --git a/helpdesk/helpdesk/doctype/hd_ticket/hd_ticket.json b/helpdesk/helpdesk/doctype/hd_ticket/hd_ticket.json
index a02871cb8..1510731ab 100644
--- a/helpdesk/helpdesk/doctype/hd_ticket/hd_ticket.json
+++ b/helpdesk/helpdesk/doctype/hd_ticket/hd_ticket.json
@@ -2,7 +2,7 @@
  "actions": [],
  "allow_import": 1,
  "autoname": "autoincrement",
- "creation": "2022-03-02 03:10:19.254460",
+ "creation": "2023-10-17 14:27:11.078679",
  "doctype": "DocType",
  "document_type": "Setup",
  "email_append_to": 1,
@@ -180,7 +180,7 @@
    "fieldname": "agreement_status",
    "fieldtype": "Select",
    "label": "SLA Status",
-   "options": "First Response Due\nResolution Due\nFailed\nFulfilled\nPaused",
+   "options": "\nFirst Response Due\nResolution Due\nFailed\nFulfilled\nPaused",
    "read_only": 1
   },
   {
@@ -379,7 +379,7 @@
  "icon": "fa fa-issue",
  "idx": 61,
  "links": [],
- "modified": "2023-10-17 13:34:03.649901",
+ "modified": "2023-10-17 16:20:41.301974",
  "modified_by": "Administrator",
  "module": "Helpdesk",
  "name": "HD Ticket",

From 2d07252a272e9af743969c1952b059db097b94ea Mon Sep 17 00:00:00 2001
From: Sabu Siyad <hello@ssiyad.com>
Date: Tue, 17 Oct 2023 21:09:14 +0530
Subject: [PATCH 4/4] chore: handle if sla does not exist

---
 helpdesk/helpdesk/doctype/hd_ticket/hd_ticket.py |  8 +++-----
 helpdesk/utils.py                                | 13 ++++++++++++-
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/helpdesk/helpdesk/doctype/hd_ticket/hd_ticket.py b/helpdesk/helpdesk/doctype/hd_ticket/hd_ticket.py
index 08bc40a8c..41b064a93 100644
--- a/helpdesk/helpdesk/doctype/hd_ticket/hd_ticket.py
+++ b/helpdesk/helpdesk/doctype/hd_ticket/hd_ticket.py
@@ -718,15 +718,13 @@ def set_sla(self):
 		"""
 		if sla := get_sla(self):
 			self.sla = sla.name
-		self.sla = None
 
 	def apply_sla(self):
 		"""
-		Apply SLA if set. This won't check whether the SLA exists. Hence, will
-		fail/error if the SLA is deleted.
+		Apply SLA if set.
 		"""
-		if self.sla:
-			frappe.get_doc("HD Service Level Agreement", self.sla).apply(self)
+		if sla := frappe.get_last_doc("HD Service Level Agreement", {"name": self.sla}):
+			sla.apply(self)
 
 	# `on_communication_update` is a special method exposed from `Communication` doctype.
 	# It is called when a communication is updated. Beware of changes as this effectively
diff --git a/helpdesk/utils.py b/helpdesk/utils.py
index 19a4702ff..04c54758d 100644
--- a/helpdesk/utils.py
+++ b/helpdesk/utils.py
@@ -22,6 +22,17 @@ def check_permissions(doctype, parent):
 		frappe.throw(f"Insufficient Permission for {doctype}", frappe.PermissionError)
 
 
+def is_admin(user: str = None) -> bool:
+	"""
+	Check whether `user` is an admin
+
+	:param user: User to check against, defaults to current user
+	:return: Whether `user` is an admin
+	"""
+	user = user or frappe.session.user
+	return user == "Administrator"
+
+
 def is_agent(user: str = None) -> bool:
 	"""
 	Check whether `user` is an agent
@@ -30,7 +41,7 @@ def is_agent(user: str = None) -> bool:
 	:return: Whether `user` is an agent
 	"""
 	user = user or frappe.session.user
-	return bool(frappe.db.exists("HD Agent", {"name": user}))
+	return is_admin() or bool(frappe.db.exists("HD Agent", {"name": user}))
 
 
 def publish_event(event: str, data: dict, user: str = None):