From a0be493a7ca42ecd80bcc41dbcb6aa8286faddca Mon Sep 17 00:00:00 2001
From: Rafael Ferreira <rafaelblink@gmail.com>
Date: Tue, 4 May 2021 16:24:47 -0300
Subject: [PATCH] [IMPROVE] Omnichannel Room Information panel flow when user
 save or close on form page. (#21688)

* back contextualbar chat room form

* fix back action and close

Co-authored-by: Renato Becker <renato.augusto.becker@gmail.com>
Co-authored-by: Martin Schoeler <martin.schoeler@rocket.chat>
---
 .../views/omnichannel/directory/ChatsContextualBar.js  |  6 +++++-
 .../omnichannel/directory/ContactContextualBar.js      | 10 +++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/client/views/omnichannel/directory/ChatsContextualBar.js b/client/views/omnichannel/directory/ChatsContextualBar.js
index 496a13d0109..bbb261f808b 100644
--- a/client/views/omnichannel/directory/ChatsContextualBar.js
+++ b/client/views/omnichannel/directory/ChatsContextualBar.js
@@ -23,6 +23,10 @@ const ChatsContextualBar = ({ chatReload }) => {
 		directoryRoute.push({ tab: 'chats' });
 	};
 
+	const handleChatsVerticalBarBackButtonClick = () => {
+		directoryRoute.push({ tab: 'chats', context: 'info', id });
+	};
+
 	return (
 		<VerticalBar className={'contextual-bar'}>
 			<VerticalBar.Header>
@@ -49,7 +53,7 @@ const ChatsContextualBar = ({ chatReload }) => {
 			{context === 'edit' && (
 				<RoomEditWithData
 					id={id}
-					close={handleChatsVerticalBarCloseButtonClick}
+					close={handleChatsVerticalBarBackButtonClick}
 					reload={chatReload}
 				/>
 			)}
diff --git a/client/views/omnichannel/directory/ContactContextualBar.js b/client/views/omnichannel/directory/ContactContextualBar.js
index be40d7d630d..171d374536a 100644
--- a/client/views/omnichannel/directory/ContactContextualBar.js
+++ b/client/views/omnichannel/directory/ContactContextualBar.js
@@ -15,7 +15,11 @@ const ContactContextualBar = ({ contactReload }) => {
 	const t = useTranslation();
 
 	const handleContactsVerticalBarCloseButtonClick = () => {
-		directoryRoute.push({});
+		directoryRoute.push({ tab: 'contacts' });
+	};
+
+	const handleContactsVerticalBarBackButtonClick = () => {
+		directoryRoute.push({ tab: 'contacts', context: 'info', id });
 	};
 
 	return (
@@ -42,14 +46,14 @@ const ContactContextualBar = ({ contactReload }) => {
 				<VerticalBar.Close onClick={handleContactsVerticalBarCloseButtonClick} />
 			</VerticalBar.Header>
 			{context === 'new' && (
-				<ContactNewEdit reload={contactReload} close={handleContactsVerticalBarCloseButtonClick} />
+				<ContactNewEdit reload={contactReload} close={handleContactsVerticalBarBackButtonClick} />
 			)}
 			{context === 'info' && <ContactInfo reload={contactReload} id={id} />}
 			{context === 'edit' && (
 				<ContactEditWithData
 					id={id}
 					reload={contactReload}
-					close={handleContactsVerticalBarCloseButtonClick}
+					close={handleContactsVerticalBarBackButtonClick}
 				/>
 			)}
 		</VerticalBar>