Skip to content

[IMPROVE] Omnichannel Room Information panel flow when user save or close on form page. #21688

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MartinSchoeler merged 6 commits into from
May 4, 2021
Merged

[IMPROVE] Omnichannel Room Information panel flow when user save or close on form page. #21688

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
be76d0f
back contextualbar chat room form
rafaelblink Apr 20, 2021
bdb22c4
Merge branch 'develop' into omnichannel/room-info-flow-close-save
rafaelblink Apr 20, 2021
9eccecb
fix back action and close
rafaelblink Apr 20, 2021
f6ae640
Merge branch 'develop' into omnichannel/room-info-flow-close-save
rafaelblink Apr 20, 2021
770ef6d
Merge branch 'develop' into omnichannel/room-info-flow-close-save
renatobecker Apr 20, 2021
3584ad4
Merge branch 'develop' into omnichannel/room-info-flow-close-save
MartinSchoeler May 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion client/views/omnichannel/directory/ChatsContextualBar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -49,7 +53,7 @@ const ChatsContextualBar = ({ chatReload }) => {
{context === 'edit' && (
<RoomEditWithData
id={id}
close={handleChatsVerticalBarCloseButtonClick}
close={handleChatsVerticalBarBackButtonClick}
reload={chatReload}
/>
)}
Expand Down
10 changes: 7 additions & 3 deletions client/views/omnichannel/directory/ContactContextualBar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand All @@ -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>
Expand Down