Merge pull request #2263 from RitvikSardana/reopen-email-once

fix: send re-open ticket not on new ticket creation

Author: RitvikSardana

desk/src/components/ListViewBuilder.vue

@@ -472,6 +472,11 @@ function applyFilters(filters) {
   isViewUpdated.value = true;
   defaultParams.filters = { ...filters };
   list.submit({ ...defaultParams });
+
+  // automatically update filters for default view
+  if (!defaultParams.is_default) return;
+  handleViewUpdate();
+  isViewUpdated.value = false;
 }
 
 function applySort(order_by: string) {

desk/src/components/layouts/Sidebar.vue

@@ -48,49 +48,51 @@
         </template>
       </SidebarLink>
     </div>
-    <div v-for="view in allViews" :key="view.label">
-      <div
-        v-if="!view.hideLabel && !isExpanded && view.views?.length"
-        class="mx-2 my-2 h-1"
-      />
-      <Section
-        :label="view.label"
-        :hideLabel="view.hideLabel"
-        :opened="view.opened"
-      >
-        <template #header="{ opened, hide, toggle }">
-          <div
-            v-if="!hide"
-            class="flex cursor-pointer gap-1.5 px-1 text-base font-medium text-ink-gray-5 transition-all duration-300 ease-in-out"
-            :class="
-              !isExpanded
-                ? 'ml-0 h-0 overflow-hidden opacity-0'
-                : 'mt-4 h-7 w-auto opacity-100'
-            "
-            @click="toggle()"
-          >
-            <FeatherIcon
-              name="chevron-right"
-              class="h-4 text-ink-gray-9 transition-all duration-300 ease-in-out"
-              :class="{ 'rotate-90': opened }"
+    <div class="overflow-y-auto">
+      <div v-for="view in allViews" :key="view.label">
+        <div
+          v-if="!view.hideLabel && !isExpanded && view.views?.length"
+          class="mx-2 my-2 h-1"
+        />
+        <Section
+          :label="view.label"
+          :hideLabel="view.hideLabel"
+          :opened="view.opened"
+        >
+          <template #header="{ opened, hide, toggle }">
+            <div
+              v-if="!hide"
+              class="flex cursor-pointer gap-1.5 px-1 text-base font-medium text-ink-gray-5 transition-all duration-300 ease-in-out"
+              :class="
+                !isExpanded
+                  ? 'ml-0 h-0 overflow-hidden opacity-0'
+                  : 'mt-4 h-7 w-auto opacity-100'
+              "
+              @click="toggle()"
+            >
+              <FeatherIcon
+                name="chevron-right"
+                class="h-4 text-ink-gray-9 transition-all duration-300 ease-in-out"
+                :class="{ 'rotate-90': opened }"
+              />
+              <span>{{ view.label }}</span>
+            </div>
+          </template>
+          <nav class="flex flex-col">
+            <SidebarLink
+              v-for="link in view.views"
+              :icon="link.icon"
+              :label="link.label"
+              :to="link.to"
+              :key="link.label"
+              :is-expanded="isExpanded"
+              :is-active="isActiveTab(link.to)"
+              class="my-0.5 emoji"
+              :onClick="link.onClick"
             />
-            <span>{{ view.label }}</span>
-          </div>
-        </template>
-        <nav class="flex flex-col">
-          <SidebarLink
-            v-for="link in view.views"
-            :icon="link.icon"
-            :label="link.label"
-            :to="link.to"
-            :key="link.label"
-            :is-expanded="isExpanded"
-            :is-active="isActiveTab(link.to)"
-            class="my-0.5 emoji"
-            :onClick="link.onClick"
-          />
-        </nav>
-      </Section>
+          </nav>
+        </Section>
+      </div>
     </div>
     <div class="grow" />
     <TrialBanner

desk/src/components/view-controls/Filter.vue

@@ -535,8 +535,6 @@ function parseFilters(filters) {
     if (["equals", "="].includes(c.operator)) {
       p[c.fieldname] =
         c.value == "Yes" ? true : c.value == "No" ? false : c.value;
-    } else if (c.operator === "in" || c.operator === "not in") {
-      p[c.fieldname] = [operatorMap[c.operator], c.value.split(",")];
     } else {
       p[c.fieldname] = [operatorMap[c.operator.toLowerCase()], c.value];
     }

desk/src/components/view-controls/QuickFilters.vue

@@ -1,13 +1,13 @@
 <template>
   <div v-if="!quickFilters.loading">
     <FadedScrollableDiv
-      class="flex flex-1 items-center -ml-1 flex-wrap"
+      class="flex flex-1 items-center -ml-1 flex-wrap gap-1 gap-y-2"
       orientation="horizontal"
     >
       <div
         v-for="filter in quickFilters.data"
         :key="filter.name"
-        class="m-1 min-w-36"
+        class="min-w-36"
       >
         <QuickFilterField
           :filter="filter"

desk/src/pages/ticket/TicketAgent.vue

@@ -375,11 +375,11 @@ function filterActivities(eventType: TicketTab) {
   }
   return activities.value.filter((activity) => activity.type === eventType);
 }
-
+const isErrorTriggered = ref(false);
 function updateTicket(fieldname: string, value: string) {
   if (value === ticket.data[fieldname]) return;
   updateOptimistic(fieldname, value);
-  isLoading.value = true;
+
   createResource({
     url: "frappe.client.set_value",
     params: {
@@ -392,6 +392,13 @@ function updateTicket(fieldname: string, value: string) {
     auto: true,
     onSuccess: () => {
       isLoading.value = false;
+      isErrorTriggered.value = false;
+      ticket.reload();
+    },
+    onError: () => {
+      if (isErrorTriggered.value) return;
+      isErrorTriggered.value = true;
+
       ticket.reload();
     },
   });

helpdesk/helpdesk/doctype/hd_ticket/hd_ticket.py

@@ -75,7 +75,7 @@ def after_insert(self):
         capture_event("ticket_created")
         publish_event("helpdesk:new-ticket", {"name": self.name})
         if self.get("description"):
-            self.create_communication_via_contact(self.description)
+            self.create_communication_via_contact(self.description, new_ticket=True)
 
     def on_update(self):
         # flake8: noqa
@@ -519,7 +519,13 @@ def reply_via_agent(
 
     @frappe.whitelist()
     # flake8: noqa
-    def create_communication_via_contact(self, message, attachments=[]):
+    def create_communication_via_contact(
+        self, message, attachments=[], new_ticket=False
+    ):
+
+        if not new_ticket:
+            # send email to assigned agents
+            self.send_reopen_email_to_agent(message)
 
         if self.status == "Replied":
             self.status = "Open"
@@ -541,9 +547,6 @@ def create_communication_via_contact(self, message, attachments=[]):
         c.ignore_mandatory = True
         c.save(ignore_permissions=True)
 
-        # send email to assigned agents
-        self.send_email_to_agent(message)
-
         _attachments = self.get("attachments") or attachments or []
         if not len(_attachments):
             return
@@ -560,7 +563,7 @@ def create_communication_via_contact(self, message, attachments=[]):
         for url in file_urls:
             self.attach_file_with_doc("HD Ticket", self.name, url)
 
-    def send_email_to_agent(self, message):
+    def send_reopen_email_to_agent(self, message):
         assigned_agents = self.get_assigned_agents()
         if not assigned_agents:
             return