Merge branch 'main' into agent_communication_area

Author: sumitbhanushali

desk/src/pages/InvalidPage.vue

@@ -0,0 +1,17 @@
+<template>
+  <div
+    class="grid h-full place-items-center px-4 py-20 text-center text-lg text-gray-600"
+  >
+    <div class="space-y-2">
+      <div>Invalid page or not permitted to access</div>
+      <Button :route="{ name: 'TicketsAgent' }">
+        <template #prefix><TicketIcon class="w-4" /></template>
+        Tickets
+      </Button>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import TicketIcon from "@/components/icons/TicketIcon.vue";
+</script>

desk/src/pages/ticket/TicketDetails.vue

@@ -115,7 +115,15 @@
         <span class="block text-sm text-gray-700">
           {{ o.label }}
         </span>
+        <FormControl
+          v-if="o.type === 'select'"
+          :type="o.type"
+          :value="data[o.field]"
+          :options="customers?.data"
+          @change="update(o.field, $event.target.value)"
+        />
         <Autocomplete
+          v-else
           :options="o.store.dropdown"
           :placeholder="`Select a ${o.label}`"
           :value="data[o.field]"
@@ -136,7 +144,7 @@
 <script setup lang="ts">
 import { computed, inject } from "vue";
 import { Autocomplete } from "@/components";
-import { createResource, Tooltip } from "frappe-ui";
+import { createResource, Tooltip, FormControl } from "frappe-ui";
 import { dayjs } from "@/dayjs";
 import { emitter } from "@/emitter";
 import { createToast } from "@/utils";
@@ -167,8 +175,27 @@ const options = computed(() => [
     label: "Team",
     store: useTeamStore(),
   },
+  {
+    field: "customer",
+    label: "Customer",
+    type: "select",
+  },
 ]);
 
+const customers = createResource({
+  url: "helpdesk.utils.get_customer",
+  params: {
+    contact: ticket?.data?.raised_by,
+  },
+  auto: true,
+  transform: (data) => {
+    return data.map((d) => ({
+      label: d,
+      value: d,
+    }));
+  },
+});
+
 function update(fieldname: string, value: string) {
   createResource({
     url: "frappe.client.set_value",

desk/src/router/index.js

@@ -55,6 +55,11 @@ const routes = [
     name: ONBOARDING_PAGE,
     component: () => import("@/pages/onboarding/SimpleOnboarding.vue"),
   },
+  {
+    path: "/:invalidpath",
+    name: "Invalid Page",
+    component: () => import("@/pages/InvalidPage.vue"),
+  },
   {
     path: "",
     name: "AgentRoot",
@@ -197,8 +202,16 @@ router.beforeEach(async (to) => {
     await authStore.init();
     await usersStore.init();
 
-    if ((to.meta.agent && !authStore.hasDeskAccess) || isAuthRoute) {
-      router.replace({ name: WEBSITE_ROOT });
+    if (isAuthRoute && authStore.isLoggedIn) {
+      if (authStore.isAgent) {
+        router.replace({ name: AGENT_PORTAL_LANDING });
+      } else {
+        router.replace({ name: CUSTOMER_PORTAL_LANDING });
+      }
+    } else if (!isAuthRoute && !authStore.isLoggedIn) {
+      router.replace({ name: "Login" });
+    } else if (to.matched.length === 0) {
+      router.replace({ name: "Invalid Page" });
     }
   } catch {
     if (!isAuthRoute) {

helpdesk/helpdesk/doctype/hd_ticket/hd_ticket.py

@@ -167,14 +167,16 @@ def before_validate(self):
 		self.check_update_perms()
 		self.set_ticket_type()
 		self.set_raised_by()
-		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()
 
+		if self.via_customer_portal:
+			self.set_contact()
+			self.set_customer()
+
 	def validate(self):
 		self.validate_feedback()
 		self.validate_ticket_type()
@@ -240,7 +242,9 @@ def set_customer(self):
 		if self.customer:
 			return
 		customer = get_customer(self.contact)
-		if len(customer) > 0:
+		
+		# let agent assign the customer when one contact has more than one customer
+		if len(customer) == 1:
 			self.customer = customer[0]
 
 	def set_priority(self):

helpdesk/utils.py

@@ -68,7 +68,7 @@ def refetch_resource(key: str | List[str], user=None):
 def capture_event(event: str):
 	return _capture(event, "helpdesk")
 
-
+@frappe.whitelist()
 def get_customer(contact: str) -> tuple[str]:
 	"""
 	Get `Customer` from `Contact`