fix(ux): allow empty sla

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"

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"

helpdesk/helpdesk/doctype/hd_service_level_agreement/hd_service_level_agreement.py

@@ -17,7 +17,7 @@
 
 
 class HDServiceLevelAgreement(Document):
 	doctype_ticket = "HD Ticket"
 
 	def validate(self):
 		self.validate_priorities()  # To refactor
@@ -95,10 +95,10 @@
 		if not self.condition:
 			return
 		try:
 			temp_doc = frappe.new_doc(self.doctype_ticket)
 			frappe.safe_eval(self.condition, None, get_context(temp_doc))
 		except Exception as e:
 			frappe.throw(
 				_("The Condition '{0}' is invalid: {1}").format(self.condition, str(e))
 			)
 
@@ -116,11 +116,6 @@
 			}
 		)
 
-	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)

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,
@@ -176,12 +176,11 @@
    "read_only": 1
   },
   {
-   "default": "First Response Due",
    "depends_on": "eval: doc.sla",
    "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
   },
   {
@@ -380,7 +379,7 @@
  "icon": "fa fa-issue",
  "idx": 61,
  "links": [],
- "modified": "2023-10-08 23:24:56.917977",
+ "modified": "2023-10-17 16:20:41.301974",
  "modified_by": "Administrator",
  "module": "Helpdesk",
  "name": "HD Ticket",

helpdesk/helpdesk/doctype/hd_ticket/hd_ticket.py

@@ -166,7 +166,7 @@
 		self.set_contact()
 		self.set_customer()
 		self.set_priority()
 		self.set_first_responded_on()
 		self.set_feedback_values()
 		self.apply_escalation_rule()
 		self.set_sla()
@@ -230,9 +230,9 @@
 			or DEFAULT_TICKET_PRIORITY
 		)
 
 	def set_first_responded_on(self):
 		if self.status == "Replied" and not self.first_responded_on:
 			self.first_responded_on = frappe.utils.now_datetime()
 
 	def set_feedback_values(self):
 		if not self.feedback:
@@ -713,12 +713,18 @@
 		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
 
 	def apply_sla(self):
-		sla = frappe.get_doc("HD Service Level Agreement", self.sla)
-		sla.apply(self)
+		"""
+		Apply SLA if set.
+		"""
+		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
@@ -727,8 +733,8 @@
 	def on_communication_update(self, c):
 		# If communication is incoming, then it is a reply from customer, and ticket must
 		# be reopened.
 		if c.sent_or_received == "Received":
 			self.status = "Open"
 		# Fetch description from communication if not set already. This might not be needed
 		# anymore as a communication is created when a ticket is created.
 		self.description = self.description or c.content

helpdesk/utils.py

@@ -22,6 +22,17 @@
 		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 @@
 	: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):