From 2c2c47d7fdb65a63e3c46f1972140ca83fb00e9a Mon Sep 17 00:00:00 2001 From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com> Date: Wed, 21 Dec 2022 13:31:53 +0530 Subject: [PATCH 01/19] chore: Hide inbox name only has one inbox (#6115) --- .../widgets/conversation/ConversationHeader.vue | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/app/javascript/dashboard/components/widgets/conversation/ConversationHeader.vue b/app/javascript/dashboard/components/widgets/conversation/ConversationHeader.vue index 5abf0eb5c..666072ef2 100644 --- a/app/javascript/dashboard/components/widgets/conversation/ConversationHeader.vue +++ b/app/javascript/dashboard/components/widgets/conversation/ConversationHeader.vue @@ -21,7 +21,11 @@ />
- + 1; + }, }, methods: { From 3c6bd2c8fd0fc18cfaba527b744de561d9805efc Mon Sep 17 00:00:00 2001 From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com> Date: Wed, 21 Dec 2022 16:01:50 +0530 Subject: [PATCH 02/19] fix: Use canned response menu from the editor in contact messages (#6109) --- .../conversation/contact/ConversationForm.vue | 25 +++++++++++++++---- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/app/javascript/dashboard/routes/dashboard/conversation/contact/ConversationForm.vue b/app/javascript/dashboard/routes/dashboard/conversation/contact/ConversationForm.vue index b56bc3490..ff20d7c23 100644 --- a/app/javascript/dashboard/routes/dashboard/conversation/contact/ConversationForm.vue +++ b/app/javascript/dashboard/routes/dashboard/conversation/contact/ConversationForm.vue @@ -66,7 +66,7 @@ @click="replaceTextWithCannedResponse" />
-
+
@@ -119,8 +111,6 @@ diff --git a/app/javascript/dashboard/components/layout/sidebarComponents/Secondary.vue b/app/javascript/dashboard/components/layout/sidebarComponents/Secondary.vue index 1d8ced445..4d75e363e 100644 --- a/app/javascript/dashboard/components/layout/sidebarComponents/Secondary.vue +++ b/app/javascript/dashboard/components/layout/sidebarComponents/Secondary.vue @@ -261,14 +261,7 @@ export default { width: 20rem; flex-shrink: 0; overflow-y: hidden; - - @include breakpoint(xlarge down) { - position: absolute; - } - - @include breakpoint(xlarge up) { - position: unset; - } + position: unset; &:hover { overflow-y: hidden; diff --git a/app/javascript/dashboard/components/specs/__snapshots__/SidemenuIcon.spec.js.snap b/app/javascript/dashboard/components/specs/__snapshots__/SidemenuIcon.spec.js.snap index 58e820fc2..32e293da6 100644 --- a/app/javascript/dashboard/components/specs/__snapshots__/SidemenuIcon.spec.js.snap +++ b/app/javascript/dashboard/components/specs/__snapshots__/SidemenuIcon.spec.js.snap @@ -1,10 +1,11 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP exports[`SidemenuIcon matches snapshot 1`] = ` - + `; diff --git a/app/javascript/dashboard/routes/dashboard/Dashboard.vue b/app/javascript/dashboard/routes/dashboard/Dashboard.vue index af5818cdb..9b573863f 100644 --- a/app/javascript/dashboard/routes/dashboard/Dashboard.vue +++ b/app/javascript/dashboard/routes/dashboard/Dashboard.vue @@ -2,14 +2,14 @@
-
+
= 1200) { - this.isOnDesktop = true; - } else { - this.isOnDesktop = false; - } - }, toggleSidebar() { - this.isSidebarOpen = !this.isSidebarOpen; + this.updateUISettings({ + show_secondary_sidebar: !this.isSidebarOpen, + }); }, openCreateAccountModal() { this.showAccountModal = false; @@ -142,8 +121,3 @@ export default { }, }; - diff --git a/app/javascript/dashboard/routes/dashboard/conversation/search/PopOverSearch.vue b/app/javascript/dashboard/routes/dashboard/conversation/search/PopOverSearch.vue index 7f7fb67df..40a0ae159 100644 --- a/app/javascript/dashboard/routes/dashboard/conversation/search/PopOverSearch.vue +++ b/app/javascript/dashboard/routes/dashboard/conversation/search/PopOverSearch.vue @@ -1,20 +1,22 @@