From ad363c59b167d763a52c406b30728c1b16d88788 Mon Sep 17 00:00:00 2001 From: dougfabris Date: Tue, 26 Mar 2024 17:38:23 -0300 Subject: [PATCH] fix: display contextualbar conditionally --- .../views/omnichannel/directory/ContextualBar.tsx | 5 ----- .../directory/OmnichannelDirectoryPage.tsx | 12 +++++++----- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/apps/meteor/client/views/omnichannel/directory/ContextualBar.tsx b/apps/meteor/client/views/omnichannel/directory/ContextualBar.tsx index 0f3f5bada7127..d0596ef8e7ec7 100644 --- a/apps/meteor/client/views/omnichannel/directory/ContextualBar.tsx +++ b/apps/meteor/client/views/omnichannel/directory/ContextualBar.tsx @@ -12,11 +12,6 @@ type ContextualBarProps = { const ContextualBar: FC = ({ chatReload }) => { const page = useRouteParameter('page'); - const bar = useRouteParameter('bar'); - - if (!bar) { - return null; - } switch (page) { case 'contacts': diff --git a/apps/meteor/client/views/omnichannel/directory/OmnichannelDirectoryPage.tsx b/apps/meteor/client/views/omnichannel/directory/OmnichannelDirectoryPage.tsx index 3c846569130c9..08b344ae3a9f2 100644 --- a/apps/meteor/client/views/omnichannel/directory/OmnichannelDirectoryPage.tsx +++ b/apps/meteor/client/views/omnichannel/directory/OmnichannelDirectoryPage.tsx @@ -15,8 +15,10 @@ import ContactTab from './contacts/ContactTab'; const DEFAULT_TAB = 'contacts'; const OmnichannelDirectoryPage = (): ReactElement => { + const t = useTranslation(); const router = useRouter(); const page = useRouteParameter('page'); + const bar = useRouteParameter('bar'); const canViewDirectory = usePermission('view-omnichannel-contact-center'); useEffect( @@ -38,8 +40,6 @@ const OmnichannelDirectoryPage = (): ReactElement => { const chatReload = () => queryClient.invalidateQueries({ queryKey: ['current-chats'] }); - const t = useTranslation(); - if (!canViewDirectory) { return ; } @@ -63,9 +63,11 @@ const OmnichannelDirectoryPage = (): ReactElement => { {(page === 'contacts' && ) || (page === 'chats' && ) || (page === 'calls' && )} - - - + {bar && ( + + + + )} ); };