From 747adf288728f9ae0497a07d56772b3488f3ce57 Mon Sep 17 00:00:00 2001
From: RitvikSardana <ritvik.sardana11@gmail.com>
Date: Thu, 19 Dec 2024 14:22:38 +0530
Subject: [PATCH 1/2] fix: handle routes properly

---
 desk/src/App.vue                    |  2 +-
 desk/src/components/SidebarLink.vue | 14 +++++++-------
 desk/src/pages/TicketAgent.vue      | 11 ++++++++---
 desk/src/router/index.ts            |  9 +++++++--
 4 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/desk/src/App.vue b/desk/src/App.vue
index 4d0c467f1..bebc1e316 100644
--- a/desk/src/App.vue
+++ b/desk/src/App.vue
@@ -1,5 +1,5 @@
 <template>
-  <RouterView class="antialiased" :key="$route.fullPath" />
+  <RouterView class="antialiased" />
   <Toasts />
   <KeymapDialog />
   <Dialogs />
diff --git a/desk/src/components/SidebarLink.vue b/desk/src/components/SidebarLink.vue
index 0073c1440..015f6857b 100644
--- a/desk/src/components/SidebarLink.vue
+++ b/desk/src/components/SidebarLink.vue
@@ -8,7 +8,7 @@
       [bgColor]: isActive,
       [hvColor]: !isActive,
     }"
-    @click="handle"
+    @click="handleNavigation"
   >
     <span
       class="shrink-0 text-gray-700"
@@ -57,12 +57,12 @@ const props = withDefaults(defineProps<P>(), {
 });
 const router = useRouter();
 
-function handle() {
+function handleNavigation() {
   props.onClick();
-  if (props.to) {
-    router.push({
-      name: props.to,
-    });
-  }
+  if (!props.to) return;
+  if (props.to === router.currentRoute.value.name) return;
+  router.push({
+    name: props.to,
+  });
 }
 </script>
diff --git a/desk/src/pages/TicketAgent.vue b/desk/src/pages/TicketAgent.vue
index 434aae64d..a2e72bf0b 100644
--- a/desk/src/pages/TicketAgent.vue
+++ b/desk/src/pages/TicketAgent.vue
@@ -169,7 +169,12 @@ const props = defineProps({
     required: true,
   },
 });
-
+watch(
+  () => props.ticketId,
+  () => {
+    ticket.reload();
+  }
+);
 provide("communicationArea", communicationAreaRef);
 
 let storage = useStorage("ticket_agent", {
@@ -184,9 +189,9 @@ const ticket = createResource({
   url: "helpdesk.helpdesk.doctype.hd_ticket.api.get_one",
   cache: ["Ticket", props.ticketId],
   auto: true,
-  params: {
+  makeParams: () => ({
     name: props.ticketId,
-  },
+  }),
   transform: (data) => {
     if (data._assign) {
       data.assignees = JSON.parse(data._assign).map((assignee) => {
diff --git a/desk/src/router/index.ts b/desk/src/router/index.ts
index 68482e4c0..71b2e39d7 100644
--- a/desk/src/router/index.ts
+++ b/desk/src/router/index.ts
@@ -233,11 +233,9 @@ export const router = createRouter({
 
 router.beforeEach(async (to, _, next) => {
   const authStore = useAuthStore();
-  const userStore = useUserStore();
 
   if (authStore.isLoggedIn) {
     await authStore.init();
-    await userStore.users.fetch();
   }
 
   if (!authStore.isLoggedIn) {
@@ -246,3 +244,10 @@ router.beforeEach(async (to, _, next) => {
     next();
   }
 });
+
+router.afterEach(async (to) => {
+  const isCustomerPortal = to.meta.public ?? false;
+  if (isCustomerPortal) return;
+  const userStore = useUserStore();
+  await userStore.users.fetch();
+});

From f46a73300ed3b68427af681ac94c76487e66b879 Mon Sep 17 00:00:00 2001
From: RitvikSardana <ritvik.sardana11@gmail.com>
Date: Thu, 19 Dec 2024 22:06:17 +0530
Subject: [PATCH 2/2] fix(styles): article heading

---
 .../knowledge-base/KnowledgeBaseArticleTopPublic.vue     | 2 +-
 .../pages/knowledge-base/KnowledgeBaseArticleTopView.vue | 2 +-
 desk/src/pages/ticket/TicketTextEditor.vue               | 9 +++++++++
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/desk/src/pages/knowledge-base/KnowledgeBaseArticleTopPublic.vue b/desk/src/pages/knowledge-base/KnowledgeBaseArticleTopPublic.vue
index d5c111163..4f6adc018 100644
--- a/desk/src/pages/knowledge-base/KnowledgeBaseArticleTopPublic.vue
+++ b/desk/src/pages/knowledge-base/KnowledgeBaseArticleTopPublic.vue
@@ -12,7 +12,7 @@
     </div>
   </div>
   <div class="border-b pb-3">
-    <div class="text-3xl font-semibold text-gray-900">
+    <div class="text-2xl font-semibold text-gray-900">
       {{ title }}
     </div>
   </div>
diff --git a/desk/src/pages/knowledge-base/KnowledgeBaseArticleTopView.vue b/desk/src/pages/knowledge-base/KnowledgeBaseArticleTopView.vue
index d30aba72f..3e32847b8 100644
--- a/desk/src/pages/knowledge-base/KnowledgeBaseArticleTopView.vue
+++ b/desk/src/pages/knowledge-base/KnowledgeBaseArticleTopView.vue
@@ -23,7 +23,7 @@
     </div>
   </div>
   <div class="border-b pb-3">
-    <div class="text-3xl font-semibold text-gray-900">
+    <div class="text-2xl font-semibold text-gray-900">
       {{ title }}
     </div>
   </div>
diff --git a/desk/src/pages/ticket/TicketTextEditor.vue b/desk/src/pages/ticket/TicketTextEditor.vue
index e1e1b4a97..a060a3c26 100644
--- a/desk/src/pages/ticket/TicketTextEditor.vue
+++ b/desk/src/pages/ticket/TicketTextEditor.vue
@@ -37,6 +37,14 @@
             private: true,
           }"
           @success="(f: File) => $emit('update:attachments', [...attachments, f])"
+          @failure="
+            () =>
+              createToast({
+                title: 'Error Uploading File',
+                icon: 'x',
+                iconClasses: 'text-red-600',
+              })
+          "
         >
           <template #default="{ openFileSelector }">
             <Button theme="gray" variant="ghost" @click="openFileSelector()">
@@ -85,6 +93,7 @@ import {
   UserAvatar,
 } from "@/components";
 import { File } from "@/types";
+import { createToast } from "@/utils";
 
 interface P {
   content: string;