fix: handle routes properly

frappe · Dec 19, 2024 · 747adf2 · 747adf2
1 parent c42c031
commit 747adf2
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 13 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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();
+});