Skip to content

[FIX] Web navigation breaks after visiting integrations admin page #21983

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
gabriellsh merged 6 commits into from
Jun 9, 2021
Merged

[FIX] Web navigation breaks after visiting integrations admin page #21983

Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bbfcfa1
Fix the routing issue in integration admin menu
csranasinghe May 6, 2021
e73ca05
Remove unused imports
csranasinghe May 6, 2021
3a329ea
Merge remote-tracking branch 'origin/develop' into integration-breaks…
May 27, 2021
ba84686
fix: missing default tab selected when context is empty
May 27, 2021
9d4bb44
Merge branch 'develop' into integration-breaks-navigation-fix
gabriellsh Jun 8, 2021
c2811be
Merge branch 'develop' into integration-breaks-navigation-fix
gabriellsh Jun 9, 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
9 changes: 2 additions & 7 deletions client/views/admin/integrations/IntegrationsPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Button, ButtonGroup, Icon, Tabs } from '@rocket.chat/fuselage';
import React, { useEffect, useCallback } from 'react';
import React, { useCallback } from 'react';

import Page from '../../../components/Page';
import { useRoute, useRouteParameter } from '../../../contexts/RouterContext';
Expand All @@ -18,11 +18,6 @@ function IntegrationsPage() {
}, [router]);

const context = useRouteParameter('context');
useEffect(() => {
if (!context) {
router.push({ context: 'webhook-incoming' });
}
}, [context, router]);

const showTable = !['zapier', 'bots'].includes(context);

Expand All @@ -41,7 +36,7 @@ function IntegrationsPage() {
</ButtonGroup>
</Page.Header>
<Tabs>
<Tabs.Item selected={context === 'webhook-incoming'} onClick={goToIncoming}>
<Tabs.Item selected={!context || context === 'webhook-incoming'} onClick={goToIncoming}>
{t('Incoming')}
</Tabs.Item>
<Tabs.Item selected={context === 'webhook-outgoing'} onClick={goToOutgoing}>
Expand Down