KumiSystems/Chatwoot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix: Filters are not applied unless I'm on the All Conversations screen (#6006)

Browse source 
* fix: Filters are not applied unless I'm on the All Conversations screen

* chore: Review fixes

* chore: Minor sidebar fixes

* chore: Review fixes

Co-authored-by: Pranav Raj S <pranav@chatwoot.com>
This commit is contained in:
Sivin Varghese 2022-12-07 12:00:51 +05:30 committed by GitHub
parent 01cc3d7c9c
commit f1d1bb84fd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/javascript/dashboard/components/ChatList.vue
View file

@ -345,6 +345,9 @@ export default {
}; };
}, },
pageTitle() { pageTitle() {
if (this.hasAppliedFilters) {
return this.$t('CHAT_LIST.TAB_HEADING');
}
if (this.inbox.name) { if (this.inbox.name) {
return this.inbox.name; return this.inbox.name;
} }
@ -439,9 +442,6 @@ export default {
}, },
methods: { methods: {
onApplyFilter(payload) { onApplyFilter(payload) {
if (this.$route.name !== 'home') {
this.$router.push({ name: 'home' });
}
this.resetBulkActions(); this.resetBulkActions();
this.foldersQuery = filterQueryGenerator(payload); this.foldersQuery = filterQueryGenerator(payload);
this.$store.dispatch('conversationPage/reset'); this.$store.dispatch('conversationPage/reset');

3
app/javascript/dashboard/components/layout/sidebarComponents/SecondaryChildNavItem.vue
View file

@ -112,6 +112,7 @@ $label-badge-size: var(--space-slab);
padding: var(--space-smaller) var(--space-smaller); padding: var(--space-smaller) var(--space-smaller);
margin: var(--space-smaller) 0; margin: var(--space-smaller) 0;
text-align: left; text-align: left;
line-height: 1.2;
&:hover { &:hover {
background: var(--s-25); background: var(--s-25);
@ -135,8 +136,6 @@ $label-badge-size: var(--space-slab);
.menu-label { .menu-label {
flex-grow: 1; flex-grow: 1;
display: inline-flex;
align-items: center;
} }
.inbox-icon { .inbox-icon {