Skip to content

regression: ContextualbarDialog being displayed without route param on Omnichannel directory #32077

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
kodiakhq merged 2 commits into from
Mar 28, 2024
Merged

regression: ContextualbarDialog being displayed without route param on Omnichannel directory #32077

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ad363c5
fix: display contextualbar conditionally
dougfabris Mar 26, 2024
87285d8
Merge branch 'release-6.7.0' into reg/omnichannel-directory-contextbar
dougfabris Mar 27, 2024
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
5 changes: 0 additions & 5 deletions apps/meteor/client/views/omnichannel/directory/ContextualBar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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':
Expand Down
12 changes: 7 additions & 5 deletions apps/meteor/client/views/omnichannel/directory/OmnichannelDirectoryPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand All @@ -38,8 +40,6 @@ const OmnichannelDirectoryPage = (): ReactElement => {

const chatReload = () => queryClient.invalidateQueries({ queryKey: ['current-chats'] });

const t = useTranslation();

if (!canViewDirectory) {
return <NotAuthorizedPage />;
}
Expand All @@ -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>
);
};
Expand Down