LeadMagnet/leadchat
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

fix: Redirect after contact delete [CW-2397] (#7740)

Browse Source 
Co-authored-by: Muhsin Keloth <muhsinkeramam@gmail.com>
Co-authored-by: Shivam Mishra <scm.mymail@gmail.com>
Co-authored-by: Pranav Raj S <pranav@chatwoot.com>
This commit is contained in:
Liam
2023-09-04 14:18:30 +01:00
committed by GitHub
parent 2483d99d3c
commit e5f7807833
5 changed files with 89 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/javascript/dashboard/routes/dashboard/commands/conversationHotKeys.js
View File

@@ -29,19 +29,7 @@ import {
UNMUTE_ACTION,
MUTE_ACTION,
} from './commandBarActions';
export const isAConversationRoute = routeName =>
[
'inbox_conversation',
'conversation_through_mentions',
'conversation_through_unattended',
'conversation_through_inbox',
'conversations_through_label',
'conversations_through_team',
'conversations_through_folders',
'conversation_through_unattended',
'conversation_through_participating',
].includes(routeName);
import { isAConversationRoute } from '../../../helper/routeHelpers';
export default {
watch: {

11
app/javascript/dashboard/routes/dashboard/commands/specs/conversationHotKeys.spec.js
View File

@@ -1,11 +0,0 @@
import { isAConversationRoute } from '../conversationHotKeys';
describe('isAConversationRoute', () => {
it('returns true if conversation route name is provided', () => {
expect(isAConversationRoute('inbox_conversation')).toBe(true);
expect(isAConversationRoute('conversation_through_inbox')).toBe(true);
expect(isAConversationRoute('conversations_through_label')).toBe(true);
expect(isAConversationRoute('conversations_through_team')).toBe(true);
expect(isAConversationRoute('dashboard')).toBe(false);
});
});

15
app/javascript/dashboard/routes/dashboard/conversation/contact/ContactInfo.vue
View File

@@ -177,6 +177,10 @@ import alertMixin from 'shared/mixins/alertMixin';
import adminMixin from '../../../../mixins/isAdmin';
import { mapGetters } from 'vuex';
import { getCountryFlag } from 'dashboard/helper/flag';
import {
isAConversationRoute,
getConversationDashboardRoute,
} from '../../../../helper/routeHelpers';
export default {
components: {
@@ -290,8 +294,15 @@ export default {
await this.$store.dispatch('contacts/delete', id);
this.$emit('panel-close');
this.showAlert(this.$t('DELETE_CONTACT.API.SUCCESS_MESSAGE'));
if (this.$route.name !== 'contacts_dashboard') {
this.$router.push({ name: 'contacts_dashboard' });
if (isAConversationRoute(this.$route.name)) {
this.$router.push({
name: getConversationDashboardRoute(this.$route.name),
});
} else if (this.$route.name !== 'contacts_dashboard') {
this.$router.push({
name: 'contacts_dashboard',
});
}
} catch (error) {
this.showAlert(