From 613b16498ac8c936011e75418a53063df51aa726 Mon Sep 17 00:00:00 2001
From: RitvikSardana <ritvik.sardana11@gmail.com>
Date: Mon, 4 Nov 2024 13:15:30 +0530
Subject: [PATCH 01/20] fix: show video controls in agent side

---
 desk/src/components/CommentTextEditor.vue | 2 ++
 desk/src/components/EmailEditor.vue       | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/desk/src/components/CommentTextEditor.vue b/desk/src/components/CommentTextEditor.vue
index cbc4bccc7..aef0a6583 100644
--- a/desk/src/components/CommentTextEditor.vue
+++ b/desk/src/components/CommentTextEditor.vue
@@ -13,6 +13,7 @@
     :editable="editable"
     :mentions="agents"
     @change="editable ? (newComment = $event) : null"
+    :extensions="[PreserveVideoControls]"
   >
     <template #bottom>
       <div v-if="editable" class="flex flex-col gap-2">
@@ -102,6 +103,7 @@ import { AttachmentIcon } from "@/components/icons/";
 import { AttachmentItem } from "@/components/";
 import { useAgentStore } from "@/stores/agent";
 import { useStorage } from "@vueuse/core";
+import { PreserveVideoControls } from "@/tiptap-extensions";
 
 const { agents: agentsList } = useAgentStore();
 
diff --git a/desk/src/components/EmailEditor.vue b/desk/src/components/EmailEditor.vue
index f1c9f4378..db502a7bc 100644
--- a/desk/src/components/EmailEditor.vue
+++ b/desk/src/components/EmailEditor.vue
@@ -10,6 +10,7 @@
     :placeholder="placeholder"
     :editable="editable"
     @change="editable ? (newEmail = $event) : null"
+    :extensions="[PreserveVideoControls]"
   >
     <template #top>
       <div class="mx-10 flex items-center gap-2 border-y py-2.5">
@@ -163,6 +164,7 @@ import {
   CannedResponseSelectorModal,
 } from "@/components";
 import { AttachmentIcon, EmailIcon } from "@/components/icons";
+import { PreserveVideoControls } from "@/tiptap-extensions";
 
 const editorRef = ref(null);
 const showCannedResponseSelectorModal = ref(false);

From 3e7bbd82f307c38922edba1d2b4ba6611afbbf69 Mon Sep 17 00:00:00 2001
From: RitvikSardana <ritvik.sardana11@gmail.com>
Date: Tue, 5 Nov 2024 12:24:44 +0530
Subject: [PATCH 02/20] fix(ui): minor UI changes

---
 desk/src/components/ViewControls.vue    |  1 -
 desk/src/components/layouts/Sidebar.vue | 11 +++--------
 desk/src/pages/TicketNew.vue            | 17 +++++++++++------
 3 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/desk/src/components/ViewControls.vue b/desk/src/components/ViewControls.vue
index ac5146a34..f89950de5 100644
--- a/desk/src/components/ViewControls.vue
+++ b/desk/src/components/ViewControls.vue
@@ -63,7 +63,6 @@
       </div>
     </FadedScrollableDiv>
     <div class="grow"></div>
-    <div class="-ml-2 h-[70%] border-l" />
 
     <div class="flex items-center gap-2">
       <Button :label="'Refresh'" @click="emit('event:reload')">
diff --git a/desk/src/components/layouts/Sidebar.vue b/desk/src/components/layouts/Sidebar.vue
index 9edb5c8e6..8bb6913d3 100644
--- a/desk/src/components/layouts/Sidebar.vue
+++ b/desk/src/components/layouts/Sidebar.vue
@@ -24,8 +24,8 @@
     </SidebarLink>
     <div class="mb-4" v-if="!isCustomerPortal">
       <div
-        v-if="notificationStore.unread"
-        class="absolute z-20 h-1.5 w-1.5 translate-x-6 translate-y-1 rounded-full bg-blue-400"
+        v-if="!notificationStore.unread"
+        class="absolute z-20 h-1.5 w-1.5 translate-x-6 translate-y-1 rounded-full bg-blue-400 left-1"
         theme="gray"
         variant="solid"
       />
@@ -37,12 +37,7 @@
         :is-expanded="isExpanded"
       >
         <template #right>
-          <Badge
-            v-if="isExpanded && notificationStore.unread"
-            :label="notificationStore.unread"
-            theme="gray"
-            variant="subtle"
-          />
+          <Badge label="20" theme="gray" variant="subtle" />
         </template>
       </SidebarLink>
     </div>
diff --git a/desk/src/pages/TicketNew.vue b/desk/src/pages/TicketNew.vue
index a8c11d8f5..a675f3070 100644
--- a/desk/src/pages/TicketNew.vue
+++ b/desk/src/pages/TicketNew.vue
@@ -28,12 +28,17 @@
       </div>
       <!-- existing fields -->
       <div class="flex flex-col" :class="subject.length >= 2 && 'gap-5'">
-        <FormControl
-          v-model="subject"
-          type="text"
-          label="Subject*"
-          placeholder="A short description"
-        />
+        <div class="flex flex-col gap-2">
+          <span class="block text-sm text-gray-700">
+            Subject
+            <span class="place-self-center text-red-500"> * </span>
+          </span>
+          <FormControl
+            v-model="subject"
+            type="text"
+            placeholder="A short description"
+          />
+        </div>
         <TicketNewArticles v-if="isCustomerPortal" :search="subject" />
         <div v-if="isCustomerPortal">
           <h4

From 3ae3cd344e926a565c6cb0c6ad81a5532047a197 Mon Sep 17 00:00:00 2001
From: RitvikSardana <ritvik.sardana11@gmail.com>
Date: Tue, 5 Nov 2024 12:27:23 +0530
Subject: [PATCH 03/20] chore: code cleanup

---
 desk/src/components/layouts/Sidebar.vue | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/desk/src/components/layouts/Sidebar.vue b/desk/src/components/layouts/Sidebar.vue
index 8bb6913d3..d4be27d06 100644
--- a/desk/src/components/layouts/Sidebar.vue
+++ b/desk/src/components/layouts/Sidebar.vue
@@ -24,7 +24,7 @@
     </SidebarLink>
     <div class="mb-4" v-if="!isCustomerPortal">
       <div
-        v-if="!notificationStore.unread"
+        v-if="notificationStore.unread"
         class="absolute z-20 h-1.5 w-1.5 translate-x-6 translate-y-1 rounded-full bg-blue-400 left-1"
         theme="gray"
         variant="solid"
@@ -37,7 +37,12 @@
         :is-expanded="isExpanded"
       >
         <template #right>
-          <Badge label="20" theme="gray" variant="subtle" />
+          <Badge
+            v-if="isExpanded && notificationStore.unread"
+            :label="notificationStore.unread"
+            theme="gray"
+            variant="subtle"
+          />
         </template>
       </SidebarLink>
     </div>

From 8be9bcb95cd4fd8b28c216f3bbf73661cc817b99 Mon Sep 17 00:00:00 2001
From: RitvikSardana <ritvik.sardana11@gmail.com>
Date: Thu, 7 Nov 2024 20:41:03 +0530
Subject: [PATCH 04/20] refactor: hd team and assignment rules flow

---
 helpdesk/helpdesk/doctype/hd_team/hd_team.py | 83 ++++++++++++++++++--
 1 file changed, 76 insertions(+), 7 deletions(-)

diff --git a/helpdesk/helpdesk/doctype/hd_team/hd_team.py b/helpdesk/helpdesk/doctype/hd_team/hd_team.py
index 900c80cb1..a40805d70 100644
--- a/helpdesk/helpdesk/doctype/hd_team/hd_team.py
+++ b/helpdesk/helpdesk/doctype/hd_team/hd_team.py
@@ -2,6 +2,8 @@
 # For license information, please see license.txt
 
 import frappe
+from frappe import _
+from frappe.core.doctype.version.version import get_diff
 from frappe.exceptions import DoesNotExistError
 from frappe.model.document import Document
 from frappe.model.naming import append_number_if_name_exists
@@ -22,18 +24,18 @@ def after_rename(self, olddn, newdn, merge=False):
         rule_doc.assign_condition = f"status == 'Open' and agent_group == '{newdn}'"
         rule_doc.save(ignore_permissions=True)
 
+    def on_update(self):
+        self.update_support_rotations()
+
     def on_trash(self):
 
         # Deletes the assignment rule for this group
         try:
-            rule = self.get_assignment_rule()
-            if rule:
-                self.assignment_rule = ""
-                self.save()
-                frappe.get_doc("Assignment Rule", rule).delete()
+            frappe.delete_doc("Assignment Rule", self.assignment_rule)
         except DoesNotExistError:
-            # TODO: Log this error
-            pass
+            frappe.throw(
+                _("Assignment Rule for HD Team {0} does not exist").format(self.name)
+            )
 
     def create_assignment_rule(self):
         """Creates the assignment rule for this group"""
@@ -72,3 +74,70 @@ def get_assignment_rule(self):
             self.create_assignment_rule()
 
         return self.assignment_rule
+
+    def update_support_rotations(self):
+        """
+        Update the support rotations for the hd_agent
+        # If agent removed remove from the support rule of the team
+        # If agent added add to the support rule of the team
+        # while adding remove from base Support Rotation
+        """
+        assg_rule_doc = frappe.get_doc("Assignment Rule", self.assignment_rule)
+        if not assg_rule_doc:
+            return
+
+        previous_doc = self.get_doc_before_save()
+        diff = get_diff(previous_doc, self)
+        if not diff:
+            return
+
+        if not diff.get("removed") and not diff.get("added"):
+            return
+
+        for user in diff.get("removed"):
+            self.update_assignment_rule_users(user, assg_rule_doc, action="remove")
+
+        for user in diff.get("added"):
+            self.update_assignment_rule_users(user, assg_rule_doc)
+
+    def update_assignment_rule_users(self, user, assignment_rule_doc, action="add"):
+        _user = user[1].get("user")
+        if not user:
+            frappe.throw(_("User Not found"))
+            return
+
+        if action == "add":
+            assignment_rule_doc.append("users", {"user": _user})
+            if assignment_rule_doc.disabled:
+                assignment_rule_doc.disabled = False
+            assignment_rule_doc.save()
+
+            # remove the user from the base assignment rule
+            base_assignment_rule = frappe.get_value(
+                "HD Settings", "HD Settings", "base_support_rotation"
+            )
+            base_assignment_rule = frappe.get_doc(
+                "Assignment Rule", base_assignment_rule
+            )
+            user_id = frappe.get_value(
+                "Assignment Rule User",
+                {"user": _user, "parent": base_assignment_rule.name},
+            )
+            if user_id:
+                frappe.delete_doc("Assignment Rule User", user_id)
+        else:
+            user_id = frappe.get_value(
+                "Assignment Rule User",
+                {"user": _user, "parent": assignment_rule_doc.name},
+            )
+            if not user_id:
+                return
+            frappe.delete_doc("Assignment Rule User", user_id)
+
+            # disable the assignment rule if there are no users
+            total_users_in_assignment_rule = frappe.db.count(
+                "Assignment Rule User", {"parent": assignment_rule_doc.name}
+            )
+            if total_users_in_assignment_rule == 0:
+                assignment_rule_doc.disabled = True
+                assignment_rule_doc.save()

From ef3d3e87b61c4820fc97997907ce9018bd764991 Mon Sep 17 00:00:00 2001
From: RitvikSardana <ritvik.sardana11@gmail.com>
Date: Mon, 11 Nov 2024 16:48:14 +0530
Subject: [PATCH 05/20] fix(patch): add patch for updating HD Team

---
 helpdesk/helpdesk/doctype/hd_team/hd_team.py |  6 ++----
 helpdesk/patches/update_hd_team_users.py     | 21 ++++++++++++++++++++
 2 files changed, 23 insertions(+), 4 deletions(-)
 create mode 100644 helpdesk/patches/update_hd_team_users.py

diff --git a/helpdesk/helpdesk/doctype/hd_team/hd_team.py b/helpdesk/helpdesk/doctype/hd_team/hd_team.py
index a40805d70..86bcdbd68 100644
--- a/helpdesk/helpdesk/doctype/hd_team/hd_team.py
+++ b/helpdesk/helpdesk/doctype/hd_team/hd_team.py
@@ -28,7 +28,6 @@ def on_update(self):
         self.update_support_rotations()
 
     def on_trash(self):
-
         # Deletes the assignment rule for this group
         try:
             frappe.delete_doc("Assignment Rule", self.assignment_rule)
@@ -78,9 +77,8 @@ def get_assignment_rule(self):
     def update_support_rotations(self):
         """
         Update the support rotations for the hd_agent
-        # If agent removed remove from the support rule of the team
-        # If agent added add to the support rule of the team
-        # while adding remove from base Support Rotation
+        # If agent removed, remove from the support rule of the team
+        # If agent added add to the support rule of the team and also, while adding remove from base Support Rotation
         """
         assg_rule_doc = frappe.get_doc("Assignment Rule", self.assignment_rule)
         if not assg_rule_doc:
diff --git a/helpdesk/patches/update_hd_team_users.py b/helpdesk/patches/update_hd_team_users.py
new file mode 100644
index 000000000..5d34a1fe9
--- /dev/null
+++ b/helpdesk/patches/update_hd_team_users.py
@@ -0,0 +1,21 @@
+import frappe
+
+
+def execute():
+    teams = frappe.get_all("HD Team", pluck="name")
+    for team in teams:
+        existing_agents = frappe.get_all(
+            "HD Team Item", filters={"team": team}, pluck="parent"
+        )
+        team_users = frappe.get_all(
+            "HD Team Member", filters={"parent": team}, pluck="user"
+        )
+
+        for agent in existing_agents:
+            if agent not in team_users:
+                team_doc = (
+                    frappe.get_doc("HD Team", team)
+                    .append("users", {"user": agent})
+                    .save()
+                )
+                print("Agent Added")

From 3de5672d0d94512164f7ecea96fccc44e30ea7a9 Mon Sep 17 00:00:00 2001
From: RitvikSardana <ritvik.sardana11@gmail.com>
Date: Mon, 11 Nov 2024 16:49:07 +0530
Subject: [PATCH 06/20] fix: remove groups field from agent doctype

---
 helpdesk/helpdesk/doctype/hd_agent/hd_agent.json | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/helpdesk/helpdesk/doctype/hd_agent/hd_agent.json b/helpdesk/helpdesk/doctype/hd_agent/hd_agent.json
index d5f6d0724..da7fdb69d 100644
--- a/helpdesk/helpdesk/doctype/hd_agent/hd_agent.json
+++ b/helpdesk/helpdesk/doctype/hd_agent/hd_agent.json
@@ -9,8 +9,7 @@
   "user",
   "agent_name",
   "user_image",
-  "is_active",
-  "groups"
+  "is_active"
  ],
  "fields": [
   {
@@ -35,12 +34,6 @@
    "in_list_view": 1,
    "label": "Is Active"
   },
-  {
-   "fieldname": "groups",
-   "fieldtype": "Table",
-   "label": "Groups",
-   "options": "HD Team Item"
-  },
   {
    "fetch_from": "user.user_image",
    "fieldname": "user_image",
@@ -51,7 +44,7 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2023-07-24 22:31:23.178626",
+ "modified": "2024-11-11 16:46:38.302701",
  "modified_by": "Administrator",
  "module": "Helpdesk",
  "name": "HD Agent",

From 6de7fdbe691539f71a789b8c967018e4034c2e84 Mon Sep 17 00:00:00 2001
From: RitvikSardana <ritvik.sardana11@gmail.com>
Date: Mon, 11 Nov 2024 16:58:56 +0530
Subject: [PATCH 07/20] fix(patch): consider only active agents

---
 helpdesk/patches/update_hd_team_users.py | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/helpdesk/patches/update_hd_team_users.py b/helpdesk/patches/update_hd_team_users.py
index 5d34a1fe9..42ed91b06 100644
--- a/helpdesk/patches/update_hd_team_users.py
+++ b/helpdesk/patches/update_hd_team_users.py
@@ -6,16 +6,21 @@ def execute():
     for team in teams:
         existing_agents = frappe.get_all(
             "HD Team Item", filters={"team": team}, pluck="parent"
-        )
+        )  # agents in HD Agent doctype
         team_users = frappe.get_all(
             "HD Team Member", filters={"parent": team}, pluck="user"
-        )
+        )  # agents in HD Team doctype
 
         for agent in existing_agents:
-            if agent not in team_users:
-                team_doc = (
-                    frappe.get_doc("HD Team", team)
-                    .append("users", {"user": agent})
-                    .save()
-                )
-                print("Agent Added")
+            is_agent_active = frappe.get_value("HD Agent", agent, "is_active")
+            if not is_agent_active:
+                continue
+
+            if is_agent_active:
+                if agent not in team_users:
+                    team_doc = (
+                        frappe.get_doc("HD Team", team)
+                        .append("users", {"user": agent})
+                        .save()
+                    )
+                    print("Agent Added")

From d9d992ef13d7d8e2ea7aac41562c7dffc4d724a7 Mon Sep 17 00:00:00 2001
From: RitvikSardana <ritvik.sardana11@gmail.com>
Date: Mon, 11 Nov 2024 17:31:07 +0530
Subject: [PATCH 08/20] fix: add new patch path in patch file

---
 helpdesk/patches.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/helpdesk/patches.txt b/helpdesk/patches.txt
index 28ff52d9a..c04b156ed 100644
--- a/helpdesk/patches.txt
+++ b/helpdesk/patches.txt
@@ -17,3 +17,4 @@ helpdesk.helpdesk.doctype.hd_ticket.patches.replace_overdue_failed
 helpdesk.patches.create_helpdesk_folder
 helpdesk.helpdesk.doctype.hd_ticket.patches.feedback_in_master
 helpdesk.helpdesk.doctype.hd_ticket.patches.first_responded_on
+helpdesk.patches.update_hd_team_users

From cb252668b300e0090ee1685c108b88dadf3080ad Mon Sep 17 00:00:00 2001
From: RitvikSardana <ritvik.sardana11@gmail.com>
Date: Mon, 11 Nov 2024 17:32:00 +0530
Subject: [PATCH 09/20] refactor: remove unnecessary code from hd agent

---
 .../helpdesk/doctype/hd_agent/hd_agent.py     | 150 ------------------
 1 file changed, 150 deletions(-)

diff --git a/helpdesk/helpdesk/doctype/hd_agent/hd_agent.py b/helpdesk/helpdesk/doctype/hd_agent/hd_agent.py
index 44a9936c0..4ecc6ccd2 100644
--- a/helpdesk/helpdesk/doctype/hd_agent/hd_agent.py
+++ b/helpdesk/helpdesk/doctype/hd_agent/hd_agent.py
@@ -21,156 +21,6 @@ def set_user_roles(self):
 
         user.save()
 
-    def on_update(self):
-        if self.has_value_changed("is_active"):
-            if not self.is_active:
-                self.remove_from_support_rotations()
-            else:
-                self.add_to_support_rotations()
-
-        if self.has_value_changed("groups") and self.is_active:
-            previous = self.get_doc_before_save()
-            if previous:
-                for group in previous.groups:
-                    if not next(
-                        (g for g in self.groups if g.team == group.team),
-                        None,
-                    ):
-                        self.remove_from_support_rotations(group.team)
-
-            self.add_to_support_rotations()
-
-    def on_trash(self):
-        self.remove_from_support_rotations()
-
-    def add_to_support_rotations(self, group=None):
-        """
-        Add the hd_agent to the support rotation for the given group or all groups
-        the hd_agent belongs to if hd_agent already added to the support roatation
-        for a group, skip
-
-        :param str group: Team name, defaults to None.
-        """
-        rule_docs = []
-        if not group:
-            # Add the hd_agent to the base support rotation
-
-            rule_docs.append(
-                frappe.get_doc(
-                    "Assignment Rule",
-                    frappe.get_doc("HD Settings").get_base_support_rotation(),
-                )
-            )
-
-            # Add the hd_agent to the support rotation for each group they belong to
-            if self.groups:
-                for group in self.groups:
-                    try:
-                        team_assignment_rule = frappe.get_doc(
-                            "HD Team", group.team
-                        ).get_assignment_rule()
-                        rule_docs.append(
-                            frappe.get_doc(
-                                "Assignment Rule",
-                                team_assignment_rule,
-                            )
-                        )
-                    except frappe.DoesNotExistError:
-                        frappe.throw(
-                            frappe._(
-                                "Assignment Rule for HD Team {0} does not exist"
-                            ).format(group.team)
-                        )
-        else:
-            # check if the group is in self.groups
-            if next(
-                (group for group in self.groups if group["group_name"] == group), None
-            ):
-                rule_docs.append(
-                    frappe.get_doc(
-                        "Assignment Rule",
-                        frappe.get_doc("HD Team", group).get_assignment_rule(),
-                    )
-                )
-            else:
-                frappe.throw(
-                    frappe._(
-                        "Agent {0} does not belong to team {1}".format(
-                            self.agent_name, group
-                        )
-                    )
-                )
-
-        for rule_doc in rule_docs:
-            skip = False
-            if rule_doc:
-                if rule_doc.users and len(rule_doc.users) > 0:
-                    for user in rule_doc.users:
-                        if (
-                            user.user == self.user
-                        ):  # if the user is already in the rule, skip
-                            skip = True
-                            break
-                if skip:
-                    continue
-
-                user_doc = frappe.get_doc(
-                    {"doctype": "Assignment Rule User", "user": self.user}
-                )
-                rule_doc.append("users", user_doc)
-                rule_doc.disabled = False  # enable the rule if it is disabled
-                rule_doc.save(ignore_permissions=True)
-
-    def remove_from_support_rotations(self, group=None):
-        rule_docs = []
-
-        if group:
-            # remove the hd_agent from the support rotation for the given group
-            rule_docs.append(
-                frappe.get_doc(
-                    "Assignment Rule",
-                    frappe.get_doc("HD Team", group).get_assignment_rule(),
-                )
-            )
-
-        else:
-            # Remove the hd_agent from the base support rotation
-            rule_docs.append(
-                frappe.get_doc(
-                    "Assignment Rule",
-                    frappe.get_doc("HD Settings").get_base_support_rotation(),
-                )
-            )
-
-            # Remove the hd_agent from the support rotation for each group they belong to
-            for group in self.groups:
-                rule_docs.append(
-                    frappe.get_doc(
-                        "Assignment Rule",
-                        frappe.get_doc("HD Team", group.team).get_assignment_rule(),
-                    )
-                )
-
-        for rule_doc in rule_docs:
-            if rule_doc.users and len(rule_doc.users) > 0:
-                for user in rule_doc.users:
-                    if user.user == self.user:
-                        if len(rule_doc.users) == 1:
-                            rule_doc.disabled = (
-                                True  # disable the rule if there are no users left
-                            )
-                        rule_doc.remove(user)
-                        rule_doc.save()
-
-    def in_group(self, group):
-        """
-        Check if agent is in the given group
-        """
-        if self.groups:
-            return next((g for g in self.groups if g.team == group), False)
-
-        return False
-
 
 @frappe.whitelist()
 def create_hd_agent(first_name, last_name, email, signature, team):

From 1f7e76fb404e43a81a9e7c00035e6e8985b62b81 Mon Sep 17 00:00:00 2001
From: RitvikSardana <ritvik.sardana11@gmail.com>
Date: Mon, 11 Nov 2024 17:32:38 +0530
Subject: [PATCH 10/20] fix: hd_agent doctype should not have track changes
 enabled

---
 helpdesk/helpdesk/doctype/hd_agent/hd_agent.json | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/helpdesk/helpdesk/doctype/hd_agent/hd_agent.json b/helpdesk/helpdesk/doctype/hd_agent/hd_agent.json
index da7fdb69d..f3425c6bc 100644
--- a/helpdesk/helpdesk/doctype/hd_agent/hd_agent.json
+++ b/helpdesk/helpdesk/doctype/hd_agent/hd_agent.json
@@ -44,7 +44,7 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2024-11-11 16:46:38.302701",
+ "modified": "2024-11-11 17:30:22.859253",
  "modified_by": "Administrator",
  "module": "Helpdesk",
  "name": "HD Agent",
@@ -88,6 +88,5 @@
  "sort_field": "modified",
  "sort_order": "DESC",
  "states": [],
- "title_field": "agent_name",
- "track_changes": 1
+ "title_field": "agent_name"
 }
\ No newline at end of file

From 4c5171dcd40d7c07e9103d0dec1b393bd5f300d8 Mon Sep 17 00:00:00 2001
From: RitvikSardana <ritvik.sardana11@gmail.com>
Date: Wed, 13 Nov 2024 14:03:16 +0530
Subject: [PATCH 11/20] refactor: remove agents if not in team

---
 .../helpdesk/doctype/hd_ticket/hd_ticket.py   | 52 +++++++++++++++----
 1 file changed, 43 insertions(+), 9 deletions(-)

diff --git a/helpdesk/helpdesk/doctype/hd_ticket/hd_ticket.py b/helpdesk/helpdesk/doctype/hd_ticket/hd_ticket.py
index da3acb747..985833559 100644
--- a/helpdesk/helpdesk/doctype/hd_ticket/hd_ticket.py
+++ b/helpdesk/helpdesk/doctype/hd_ticket/hd_ticket.py
@@ -346,14 +346,16 @@ def remove_assignment_if_not_in_team(self):
         if not self.agent_group or (hasattr(self, "_assign") and not self._assign):
             return
         if self.has_value_changed("agent_group") and self.status == "Open":
-            current_assigned_agent_doc = self.get_assigned_agent()
+            current_assigned_agent = self.get_assigned_agent()
+            if not current_assigned_agent:
+                return
+            is_agent_in_assigned_team = self.agent_in_assigned_team(
+                current_assigned_agent, self.agent_group
+            )
+
             if (
-                current_assigned_agent_doc
-                and not current_assigned_agent_doc.in_group(self.agent_group)
-            ) and frappe.get_doc(
-                "Assignment Rule",
-                frappe.get_doc("HD Team", self.agent_group).assignment_rule,
-            ).users:
+                not is_agent_in_assigned_team
+            ) and self.users_present_in_team_assignment_rule():
                 clear_all_assignments("HD Ticket", self.name)
                 frappe.publish_realtime(
                     "helpdesk:update-ticket-assignee",
@@ -361,6 +363,39 @@ def remove_assignment_if_not_in_team(self):
                     after_commit=True,
                 )
 
+    def agent_in_assigned_team(self, agent, team):
+        return frappe.db.exists(
+            "HD Team Member",
+            {
+                "parent": team,
+                "user": agent,
+            },
+        )
+
+    def users_present_in_team_assignment_rule(self):
+        if not self.agent_group:
+            return False
+
+        assignment_rule = frappe.db.get_value(
+            "HD Team", self.agent_group, "assignment_rule"
+        )
+        if not assignment_rule:
+            return False
+
+        is_disabled = frappe.db.get_value(
+            "Assignment Rule", assignment_rule, "disabled"
+        )
+        if is_disabled:
+            return False
+
+        users = frappe.get_all(
+            "Assignment Rule User", filters={"parent": assignment_rule}
+        )
+        if not users:
+            return False
+
+        return True
+
     @frappe.whitelist()
     def assign_agent(self, agent):
         assign({"assign_to": [agent], "doctype": "HD Ticket", "name": self.name})
@@ -386,8 +421,7 @@ def get_assigned_agent(self):
                 # TODO: temporary fix, remove this when only agents can be assigned to ticket
                 exists = frappe.db.exists("HD Agent", assignees[0])
                 if exists:
-                    agent_doc = frappe.get_doc("HD Agent", assignees[0])
-                    return agent_doc
+                    return assignees[0]
 
         assignees = get_assignees({"doctype": "HD Ticket", "name": self.name})
         if len(assignees) > 0:

From b669151a0a9c00b0210864d03a9f5cfbce4646bd Mon Sep 17 00:00:00 2001
From: RitvikSardana <ritvik.sardana11@gmail.com>
Date: Wed, 13 Nov 2024 15:50:27 +0530
Subject: [PATCH 12/20] refactor: patch

---
 helpdesk/patches/update_hd_team_users.py | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/helpdesk/patches/update_hd_team_users.py b/helpdesk/patches/update_hd_team_users.py
index 42ed91b06..e162cb065 100644
--- a/helpdesk/patches/update_hd_team_users.py
+++ b/helpdesk/patches/update_hd_team_users.py
@@ -13,14 +13,10 @@ def execute():
 
         for agent in existing_agents:
             is_agent_active = frappe.get_value("HD Agent", agent, "is_active")
-            if not is_agent_active:
-                continue
-
-            if is_agent_active:
-                if agent not in team_users:
-                    team_doc = (
-                        frappe.get_doc("HD Team", team)
-                        .append("users", {"user": agent})
-                        .save()
-                    )
-                    print("Agent Added")
+            if is_agent_active and agent not in team_users:
+                team_doc = (
+                    frappe.get_doc("HD Team", team)
+                    .append("users", {"user": agent})
+                    .save()
+                )
+                print("Agent Added")

From fffedda3ad29a710242d7818c9ae852852fcc1ef Mon Sep 17 00:00:00 2001
From: RitvikSardana <ritvik.sardana11@gmail.com>
Date: Thu, 14 Nov 2024 00:29:19 +0530
Subject: [PATCH 13/20] fix: remove assignment rule on deletion of team

---
 helpdesk/helpdesk/doctype/hd_team/hd_team.py | 29 ++++++++++++++++++--
 1 file changed, 26 insertions(+), 3 deletions(-)

diff --git a/helpdesk/helpdesk/doctype/hd_team/hd_team.py b/helpdesk/helpdesk/doctype/hd_team/hd_team.py
index 86bcdbd68..7a9d0c40d 100644
--- a/helpdesk/helpdesk/doctype/hd_team/hd_team.py
+++ b/helpdesk/helpdesk/doctype/hd_team/hd_team.py
@@ -14,8 +14,20 @@ class HDTeam(Document):
     def rename_self(self, new_name: str):
         self.rename(new_name)
 
+    # nosemgrep: frappe-semgrep-rules.rules.frappe-modifying-but-not-comitting
     def after_insert(self):
         self.create_assignment_rule()
+        assignment_rule_doc = frappe.get_doc("Assignment Rule", self.assignment_rule)
+
+        for user in self.users:
+            _user = user.get("user")
+            if not _user:
+                continue
+            assignment_rule_doc.append("users", {"user": _user})
+
+        if assignment_rule_doc.disabled and assignment_rule_doc.users:
+            assignment_rule_doc.disabled = False
+        assignment_rule_doc.save()
 
     def after_rename(self, olddn, newdn, merge=False):
         # Update the condition for the linked assignment rule
@@ -29,11 +41,22 @@ def on_update(self):
 
     def on_trash(self):
         # Deletes the assignment rule for this group
+        rule = self.assignment_rule
+        if not rule:
+            return
         try:
-            frappe.delete_doc("Assignment Rule", self.assignment_rule)
+            frappe.delete_doc(
+                "Assignment Rule",
+                rule,
+                ignore_permissions=True,
+                force=True,
+                ignore_on_trash=True,
+            )
+            frappe.db.commit()
         except DoesNotExistError:
-            frappe.throw(
-                _("Assignment Rule for HD Team {0} does not exist").format(self.name)
+            frappe.log_error(
+                title="Assignment Rule not found",
+                message=f"Assignment Rule {rule} not found",
             )
 
     def create_assignment_rule(self):

From 4647ac609b609f2a56a45ac07eee05e3caf610d2 Mon Sep 17 00:00:00 2001
From: RitvikSardana <ritvik.sardana11@gmail.com>
Date: Thu, 14 Nov 2024 00:33:31 +0530
Subject: [PATCH 14/20] fix: semgrep ignore

---
 helpdesk/helpdesk/doctype/hd_team/hd_team.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/helpdesk/helpdesk/doctype/hd_team/hd_team.py b/helpdesk/helpdesk/doctype/hd_team/hd_team.py
index 7a9d0c40d..75fb85e7c 100644
--- a/helpdesk/helpdesk/doctype/hd_team/hd_team.py
+++ b/helpdesk/helpdesk/doctype/hd_team/hd_team.py
@@ -14,7 +14,7 @@ class HDTeam(Document):
     def rename_self(self, new_name: str):
         self.rename(new_name)
 
-    # nosemgrep: frappe-semgrep-rules.rules.frappe-modifying-but-not-comitting
+    # nosemgrep: frappe-semgrep-rules.rules.frappe-modifying-but-not-comitting-other-method
     def after_insert(self):
         self.create_assignment_rule()
         assignment_rule_doc = frappe.get_doc("Assignment Rule", self.assignment_rule)

From 3e1c5fe37aca44327715f377f7d6a897bb068ee5 Mon Sep 17 00:00:00 2001
From: RitvikSardana <ritvik.sardana11@gmail.com>
Date: Thu, 14 Nov 2024 01:11:24 +0530
Subject: [PATCH 15/20] fix: show frappe_mail_site field while creating Frappe
 Mail Account

---
 desk/src/components/Settings/EmailAdd.vue   | 3 ++-
 desk/src/components/Settings/EmailEdit.vue  | 6 ++++--
 desk/src/components/Settings/emailConfig.ts | 6 ++++++
 desk/src/types.ts                           | 1 +
 helpdesk/api/settings.py                    | 1 +
 5 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/desk/src/components/Settings/EmailAdd.vue b/desk/src/components/Settings/EmailAdd.vue
index 3d15e0e28..9d3f189bb 100644
--- a/desk/src/components/Settings/EmailAdd.vue
+++ b/desk/src/components/Settings/EmailAdd.vue
@@ -121,6 +121,7 @@ const state: Reactive<EmailAccount> = reactive({
   password: "",
   api_key: "",
   api_secret: "",
+  frappe_mail_site: "",
   enable_incoming: false,
   enable_outgoing: false,
   default_incoming: false,
@@ -157,7 +158,7 @@ const addEmailRes = createResource({
   },
 });
 
-const error = ref("");
+const error = ref<string | undefined>();
 function createEmailAccount() {
   error.value = validateInputs(state, selectedService.value.custom);
   if (error.value) return;
diff --git a/desk/src/components/Settings/EmailEdit.vue b/desk/src/components/Settings/EmailEdit.vue
index 3dc48e4c7..7261cf1ac 100644
--- a/desk/src/components/Settings/EmailEdit.vue
+++ b/desk/src/components/Settings/EmailEdit.vue
@@ -113,6 +113,7 @@ const state = reactive({
   api_key: props.accountData?.api_key || null,
   api_secret: props.accountData?.api_secret || null,
   password: props.accountData?.password || null,
+  frappe_mail_site: props.accountData?.frappe_mail_site || "",
   enable_incoming: props.accountData.enable_incoming || false,
   enable_outgoing: props.accountData.enable_outgoing || false,
   default_outgoing: props.accountData.default_outgoing || false,
@@ -135,7 +136,7 @@ const fields = computed(() => {
   return popularProviderFields;
 });
 
-const error = ref("");
+const error = ref<string | undefined>();
 const loading = ref(false);
 async function updateAccount() {
   error.value = validateInputs(state, isCustomService.value);
@@ -189,7 +190,8 @@ const isDirty = computed(() => {
     state.enable_incoming !== props.accountData.enable_incoming ||
     state.enable_outgoing !== props.accountData.enable_outgoing ||
     state.default_outgoing !== props.accountData.default_outgoing ||
-    state.default_incoming !== props.accountData.default_incoming
+    state.default_incoming !== props.accountData.default_incoming ||
+    state.frappe_mail_site !== props.accountData.frappe_mail_site
   );
 });
 
diff --git a/desk/src/components/Settings/emailConfig.ts b/desk/src/components/Settings/emailConfig.ts
index 0b2222d02..9f11e4cf0 100644
--- a/desk/src/components/Settings/emailConfig.ts
+++ b/desk/src/components/Settings/emailConfig.ts
@@ -64,6 +64,12 @@ export const popularProviderFields = [
 
 export const customProviderFields = [
   ...fixedFields,
+  {
+    label: "Frappe Mail Site",
+    name: "frappe_mail_site",
+    type: "text",
+    placeholder: "https://frappemail.com",
+  },
   {
     label: "API Key",
     name: "api_key",
diff --git a/desk/src/types.ts b/desk/src/types.ts
index a4d9feb13..97d40f0fc 100644
--- a/desk/src/types.ts
+++ b/desk/src/types.ts
@@ -192,6 +192,7 @@ export interface EmailAccount {
   api_key?: string;
   api_secret?: string;
   password?: string;
+  frappe_mail_site?: string;
   enable_outgoing?: boolean;
   enable_incoming?: boolean;
   default_outgoing?: boolean;
diff --git a/helpdesk/api/settings.py b/helpdesk/api/settings.py
index 66d9034af..a94fb5291 100644
--- a/helpdesk/api/settings.py
+++ b/helpdesk/api/settings.py
@@ -35,6 +35,7 @@ def create_email_account(data):
         if service == "Frappe Mail":
             email_doc.api_key = data.get("api_key")
             email_doc.api_secret = data.get("api_secret")
+            email_doc.frappe_mail_site = data.get("frappe_mail_site")
         else:
             email_doc.password = data.get("password")
             # validate whether the credentials are correct

From 654d629ec66ee8463b8e860d3d16326c42b7e434 Mon Sep 17 00:00:00 2001
From: Sampada <sampadak@byteshores.com>
Date: Wed, 20 Nov 2024 06:06:29 +0000
Subject: [PATCH 16/20] fix: Maintain order of custom fields.

This fix maintains the order in which custom fields were added to the tickets and shows up in the side panel.
---
 helpdesk/helpdesk/doctype/hd_ticket_template/api.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/helpdesk/helpdesk/doctype/hd_ticket_template/api.py b/helpdesk/helpdesk/doctype/hd_ticket_template/api.py
index b46ac5e89..71da35d60 100644
--- a/helpdesk/helpdesk/doctype/hd_ticket_template/api.py
+++ b/helpdesk/helpdesk/doctype/hd_ticket_template/api.py
@@ -60,5 +60,6 @@ def get_fields(template: str, fetch: Literal["Custom Field", "DocField"]):
         .join(QBFetch, JoinType.inner)
         .on(QBFetch.fieldname == fields.fieldname)
         .where(where_parent)
+        .orderby(fields.idx)
         .run(as_dict=True)
     )

From a3df2108fc4b60cdb9c0e412c9c36642bf347254 Mon Sep 17 00:00:00 2001
From: RitvikSardana <ritvik.sardana11@gmail.com>
Date: Fri, 22 Nov 2024 16:23:21 +0530
Subject: [PATCH 17/20] fix: dont create null communication

---
 helpdesk/api/settings.py                         | 7 ++++---
 helpdesk/helpdesk/doctype/hd_ticket/hd_ticket.py | 3 ---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/helpdesk/api/settings.py b/helpdesk/api/settings.py
index a94fb5291..f7eaf7d01 100644
--- a/helpdesk/api/settings.py
+++ b/helpdesk/api/settings.py
@@ -29,14 +29,15 @@ def create_email_account(data):
                 **service_config,
             }
         )
-        email_doc.append(
-            "imap_folder", {"append_to": "HD Ticket", "folder_name": "INBOX"}
-        )
         if service == "Frappe Mail":
             email_doc.api_key = data.get("api_key")
             email_doc.api_secret = data.get("api_secret")
             email_doc.frappe_mail_site = data.get("frappe_mail_site")
+            email_doc.append_to = "HD Ticket"
         else:
+            email_doc.append(
+                "imap_folder", {"append_to": "HD Ticket", "folder_name": "INBOX"}
+            )
             email_doc.password = data.get("password")
             # validate whether the credentials are correct
             email_doc.get_incoming_server()
diff --git a/helpdesk/helpdesk/doctype/hd_ticket/hd_ticket.py b/helpdesk/helpdesk/doctype/hd_ticket/hd_ticket.py
index 985833559..165a96afb 100644
--- a/helpdesk/helpdesk/doctype/hd_ticket/hd_ticket.py
+++ b/helpdesk/helpdesk/doctype/hd_ticket/hd_ticket.py
@@ -191,9 +191,6 @@ def after_insert(self):
         log_ticket_activity(self.name, "created this ticket")
         capture_event("ticket_created")
         publish_event("helpdesk:new-ticket", {"name": self.name})
-        # create communication if we are not hitting the new ticket creation API
-        if not self.via_customer_portal:
-            self.create_communication_via_contact(self.description)
 
     def on_update(self):
         # flake8: noqa

From 4d8828f3240d7ee3b0df0047310a82fd87d5d8ac Mon Sep 17 00:00:00 2001
From: RitvikSardana <ritvik.sardana11@gmail.com>
Date: Fri, 22 Nov 2024 16:57:14 +0530
Subject: [PATCH 18/20] feat: setting to auto update status on reply

---
 .../helpdesk/doctype/hd_settings/hd_settings.json | 15 ++++++++++++++-
 helpdesk/helpdesk/doctype/hd_ticket/hd_ticket.py  |  4 ++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/helpdesk/helpdesk/doctype/hd_settings/hd_settings.json b/helpdesk/helpdesk/doctype/hd_settings/hd_settings.json
index a01dbb9c4..908fddf18 100644
--- a/helpdesk/helpdesk/doctype/hd_settings/hd_settings.json
+++ b/helpdesk/helpdesk/doctype/hd_settings/hd_settings.json
@@ -28,6 +28,8 @@
   "column_break_zxek",
   "ticket_restrictions_section",
   "allow_anyone_to_create_tickets",
+  "section_break_duow",
+  "auto_update_status",
   "workflow_tab",
   "skip_email_workflow",
   "instantly_send_email",
@@ -294,11 +296,22 @@
    "fieldname": "allow_anyone_to_create_tickets",
    "fieldtype": "Check",
    "label": "Allow anyone to create tickets"
+  },
+  {
+   "fieldname": "section_break_duow",
+   "fieldtype": "Section Break"
+  },
+  {
+   "default": "0",
+   "description": "When enabled, the ticket status will automatically change to \"Replied\" whenever the agent responds to a ticket.\n",
+   "fieldname": "auto_update_status",
+   "fieldtype": "Check",
+   "label": "Auto Update Status"
   }
  ],
  "issingle": 1,
  "links": [],
- "modified": "2024-10-22 02:14:33.360809",
+ "modified": "2024-11-22 16:50:02.831137",
  "modified_by": "Administrator",
  "module": "Helpdesk",
  "name": "HD Settings",
diff --git a/helpdesk/helpdesk/doctype/hd_ticket/hd_ticket.py b/helpdesk/helpdesk/doctype/hd_ticket/hd_ticket.py
index 165a96afb..daf302688 100644
--- a/helpdesk/helpdesk/doctype/hd_ticket/hd_ticket.py
+++ b/helpdesk/helpdesk/doctype/hd_ticket/hd_ticket.py
@@ -738,6 +738,10 @@ def on_communication_update(self, c):
             self.first_responded_on = (
                 self.first_responded_on or frappe.utils.now_datetime()
             )
+
+            if frappe.db.get_single_value("HD Settings", "auto_update_status"):
+                self.status = "Replied"
+
         # 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

From 64e63aa41be56a161825b1242dfe475022250d08 Mon Sep 17 00:00:00 2001
From: RitvikSardana <ritvik.sardana11@gmail.com>
Date: Fri, 22 Nov 2024 18:45:29 +0530
Subject: [PATCH 19/20] feat: setting to make feedback mandatory

---
 desk/src/App.vue                              |  7 ++--
 desk/src/pages/TicketCustomer.vue             | 37 +++++++++++--------
 desk/src/stores/config.ts                     |  4 ++
 helpdesk/api/config.py                        |  1 +
 .../doctype/hd_settings/hd_settings.json      | 16 +++++++-
 5 files changed, 46 insertions(+), 19 deletions(-)

diff --git a/desk/src/App.vue b/desk/src/App.vue
index 37c20a52a..a56b0e0e1 100644
--- a/desk/src/App.vue
+++ b/desk/src/App.vue
@@ -2,16 +2,17 @@
   <RouterView class="antialiased" />
   <Toasts />
   <KeymapDialog />
+  <Dialogs />
 </template>
 
 <script setup lang="ts">
-import { provide, ref, onMounted, onUnmounted } from "vue";
+import { onMounted, onUnmounted } from "vue";
 import { Toasts } from "frappe-ui";
 import { createToast } from "@/utils";
 import { useConfigStore } from "@/stores/config";
 import KeymapDialog from "@/pages/KeymapDialog.vue";
-import { stopSession } from "@/telemetry";
-import { init as initTelemetry } from "@/telemetry";
+import { init as initTelemetry, stopSession } from "@/telemetry";
+import { Dialogs } from "frappe-ui";
 useConfigStore();
 
 onMounted(async () => {
diff --git a/desk/src/pages/TicketCustomer.vue b/desk/src/pages/TicketCustomer.vue
index 35d14f305..d4193cdca 100644
--- a/desk/src/pages/TicketCustomer.vue
+++ b/desk/src/pages/TicketCustomer.vue
@@ -6,7 +6,7 @@
       </template>
       <template #right-header>
         <Button
-          v-if="showResolveButton"
+          v-if="ticket.data.status !== 'Closed'"
           label="Close"
           theme="gray"
           variant="solid"
@@ -70,6 +70,8 @@ import { createToast } from "@/utils";
 import { LayoutHeader } from "@/components";
 import TicketCustomerSidebar from "@/components/ticket/TicketCustomerSidebar.vue";
 import { useScreenSize } from "@/composables/screen";
+import { useConfigStore } from "@/stores/config";
+import { confirmDialog } from "frappe-ui";
 interface P {
   ticketId: string;
 }
@@ -122,14 +124,26 @@ const send = createResource({
   },
 });
 
-function handleClose() {
+async function handleClose() {
   if (showFeedback.value) {
     showFeedbackDialog.value = true;
   } else {
-    setValue.submit({ fieldname: "status", value: "Closed" });
+    showConfirmationDialog();
   }
 }
 
+function showConfirmationDialog() {
+  confirmDialog({
+    title: "Close Ticket",
+    message: "Are you sure you want to close this ticket?",
+    onConfirm: ({ hideDialog }: { hideDialog: Function }) => {
+      ticket.data.status = "Closed";
+      setValue.submit({ fieldname: "status", value: "Closed" });
+      hideDialog();
+    },
+  });
+}
+
 const setValue = createResource({
   url: "frappe.client.set_value",
   debounce: 300,
@@ -157,21 +171,14 @@ const breadcrumbs = computed(() => {
   return items;
 });
 
-const showReopenButton = computed(
-  () => ticket.data.status === "Resolved" && !ticket.data.feedback
-);
-const showResolveButton = computed(() =>
-  ["Open", "Replied"].includes(ticket.data.status)
-);
-
 const showEditor = computed(() => ticket.data.status !== "Closed");
 
 // this handles whether the ticket was raised and then was closed without any reply from the agent.
+const { isFeedbackMandatory } = useConfigStore();
 const showFeedback = computed(() => {
-  return ticket.data?.communications?.some((c) => {
-    if (c.sender !== ticket.data.raised_by) {
-      return true;
-    }
-  });
+  const hasAgentCommunication = ticket.data?.communications?.some(
+    (c) => c.sender !== ticket.data.raised_by
+  );
+  return hasAgentCommunication && isFeedbackMandatory;
 });
 </script>
diff --git a/desk/src/stores/config.ts b/desk/src/stores/config.ts
index 83b557bc4..f2c9064ef 100644
--- a/desk/src/stores/config.ts
+++ b/desk/src/stores/config.ts
@@ -20,6 +20,9 @@ export const useConfigStore = defineStore("config", () => {
   const preferKnowledgeBase = computed(
     () => !!parseInt(config.value.prefer_knowledge_base)
   );
+  const isFeedbackMandatory = computed(
+    () => !!parseInt(config.value.is_feedback_mandatory)
+  );
 
   socket.on("helpdesk:settings-updated", () => configRes.reload());
 
@@ -29,5 +32,6 @@ export const useConfigStore = defineStore("config", () => {
     preferKnowledgeBase,
     isSetupComplete,
     skipEmailWorkflow,
+    isFeedbackMandatory,
   };
 });
diff --git a/helpdesk/api/config.py b/helpdesk/api/config.py
index 1772ccf88..a431ea1df 100644
--- a/helpdesk/api/config.py
+++ b/helpdesk/api/config.py
@@ -8,6 +8,7 @@ def get_config():
         "prefer_knowledge_base",
         "setup_complete",
         "skip_email_workflow",
+        "is_feedback_mandatory",
     ]
     res = frappe.get_value(doctype="HD Settings", fieldname=fields, as_dict=True)
     return res
diff --git a/helpdesk/helpdesk/doctype/hd_settings/hd_settings.json b/helpdesk/helpdesk/doctype/hd_settings/hd_settings.json
index 908fddf18..5bf9407ef 100644
--- a/helpdesk/helpdesk/doctype/hd_settings/hd_settings.json
+++ b/helpdesk/helpdesk/doctype/hd_settings/hd_settings.json
@@ -28,6 +28,8 @@
   "column_break_zxek",
   "ticket_restrictions_section",
   "allow_anyone_to_create_tickets",
+  "feedback_section",
+  "is_feedback_mandatory",
   "section_break_duow",
   "auto_update_status",
   "workflow_tab",
@@ -307,11 +309,23 @@
    "fieldname": "auto_update_status",
    "fieldtype": "Check",
    "label": "Auto Update Status"
+  },
+  {
+   "fieldname": "feedback_section",
+   "fieldtype": "Section Break",
+   "label": "Feedback"
+  },
+  {
+   "default": "0",
+   "description": "If enabled, the feedback dialog will be shown, when a user tries to close a ticket. \nNote: User can't close a ticket without giving a feedback.",
+   "fieldname": "is_feedback_mandatory",
+   "fieldtype": "Check",
+   "label": "Make Feedback Mandatory"
   }
  ],
  "issingle": 1,
  "links": [],
- "modified": "2024-11-22 16:50:02.831137",
+ "modified": "2024-11-22 17:25:40.112881",
  "modified_by": "Administrator",
  "module": "Helpdesk",
  "name": "HD Settings",

From 76fea07b1f76d6cc3ad065cc2c9782c624dfd36f Mon Sep 17 00:00:00 2001
From: RitvikSardana <ritvik.sardana11@gmail.com>
Date: Fri, 22 Nov 2024 18:46:35 +0530
Subject: [PATCH 20/20] chore: code cleanup

---
 desk/src/pages/TicketCustomer.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/desk/src/pages/TicketCustomer.vue b/desk/src/pages/TicketCustomer.vue
index d4193cdca..e61d96cac 100644
--- a/desk/src/pages/TicketCustomer.vue
+++ b/desk/src/pages/TicketCustomer.vue
@@ -124,7 +124,7 @@ const send = createResource({
   },
 });
 
-async function handleClose() {
+function handleClose() {
   if (showFeedback.value) {
     showFeedbackDialog.value = true;
   } else {