Merge pull request #1839 from frappe/develop

dev to main
frappe · Jun 17, 2024 · 957b2ae · 957b2ae
2 parents bc4457a + a11ca84
commit 957b2ae
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 9 deletions.
diff --git a/desk/src/components/SidebarLink.vue b/desk/src/components/SidebarLink.vue
@@ -28,6 +28,7 @@
       }"
     >
       {{ label }}
+      <slot name="right" />
     </div>
   </div>
 </template>

diff --git a/desk/src/components/desk/sidebar/SideBar.vue b/desk/src/components/desk/sidebar/SideBar.vue
@@ -7,7 +7,7 @@
     }"
   >
     <UserMenu class="mb-2 ml-0.5" :options="profileSettings" />
-    <!-- <SidebarLink
+    <SidebarLink
       label="Search"
       class="mb-1"
       :icon="LucideSearch"
@@ -20,7 +20,7 @@
           <span>K</span>
         </span>
       </template>
-    </SidebarLink> -->
+    </SidebarLink>
     <span class="mb-4">
       <div
         v-if="notificationStore.unread"
@@ -94,13 +94,15 @@ import LucideTicket from "~icons/lucide/ticket";
 import LucideUser from "~icons/lucide/user";
 import LucideUserCircle2 from "~icons/lucide/user-circle-2";
 import LucideUsers from "~icons/lucide/users";
+import LucideSearch from "~icons/lucide/search";
 
 const route = useRoute();
 const router = useRouter();
 const authStore = useAuthStore();
 const keymapStore = useKeymapStore();
 const notificationStore = useNotificationStore();
 const { isExpanded, width } = storeToRefs(useSidebarStore());
+const device = useDevice();
 
 const menuOptions = computed(() => [
   {
@@ -161,9 +163,9 @@ const profileSettings = [
   },
 ];
 
-// function openCommandPalette() {
-//   window.dispatchEvent(
-//     new KeyboardEvent("keydown", { key: "k", metaKey: true })
-//   );
-// }
+function openCommandPalette() {
+  window.dispatchEvent(
+    new KeyboardEvent("keydown", { key: "k", metaKey: true })
+  );
+}
 </script>
diff --git a/desk/src/pages/TicketAgent.vue b/desk/src/pages/TicketAgent.vue
@@ -134,7 +134,8 @@
 </template>
 
 <script setup lang="ts">
-import { computed, ref, h } from "vue";
+import { computed, ref, h, watch } from "vue";
+import { useStorage } from "@vueuse/core";
 import {
   Breadcrumbs,
   Dropdown,
@@ -171,7 +172,11 @@ const props = defineProps({
   },
 });
 
-const showFullActivity = ref(true);
+let storage = useStorage("ticket_agent", {
+  showAllActivity: true,
+});
+
+const showFullActivity = ref(storage.value.showAllActivity);
 const showAssignmentModal = ref(false);
 const showSubjectDialog = ref(false);
 
@@ -213,6 +218,13 @@ const breadcrumbs = computed(() => {
   return items;
 });
 
+watch(
+  () => showFullActivity.value,
+  (value) => {
+    storage.value.showAllActivity = value;
+  }
+);
+
 const dropdownOptions = computed(() =>
   ticketStatusStore.options.map((o) => ({
     label: o,