From f47ebcb163e55fe6c416cd1732d6fb0a2c1d963e Mon Sep 17 00:00:00 2001
From: Douglas Fabris <devfabris@gmail.com>
Date: Thu, 28 Mar 2024 10:26:58 -0300
Subject: [PATCH] regression: `ContextualbarDialog` being displayed without
route param on Omnichannel directory (#32077)
---
.../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 0f3f5bada71..d0596ef8e7e 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<ContextualBarProps> = ({ 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 3c846569130..08b344ae3a9 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 <NotAuthorizedPage />;
}
@@ -63,9 +63,11 @@ const OmnichannelDirectoryPage = (): ReactElement => {
{(page === 'contacts' && <ContactTab />) || (page === 'chats' && <ChatTab />) || (page === 'calls' && <CallTab />)}
</PageContent>
</Page>
- <ContextualbarDialog>
- <ContextualBar chatReload={chatReload} />
- </ContextualbarDialog>
+ {bar && (
+ <ContextualbarDialog>
+ <ContextualBar chatReload={chatReload} />
+ </ContextualbarDialog>
+ )}
</Page>
);
};
--
GitLab