Skip to content

Commit

Permalink
MSCR-428 Clear search screen when navigating
Browse files Browse the repository at this point in the history
  • Loading branch information
maariaw committed May 23, 2024
1 parent 2017b29 commit 30cbce5
Showing 1 changed file with 27 additions and 7 deletions.
34 changes: 27 additions & 7 deletions mscr-ui/src/common/components/side-navigation/index.tsx
Original file line number Diff line number Diff line change
@@ -13,14 +13,16 @@ import {
MscrSideNavigationLevel1,
} from './side-navigation.styles';
import { useTranslation } from 'next-i18next';
import { useState } from 'react';
import { useContext, useState } from 'react';
import { useRouter } from 'next/router';
import { MscrUser } from '@app/common/interfaces/mscr-user.interface';
import getOrganizations from '@app/common/utils/get-organizations';
import { SearchContext } from '@app/common/components/search-context-provider';

export default function SideNavigationPanel({ user }: { user?: MscrUser }) {
const { breakpoint } = useBreakpoints();
const { t } = useTranslation('common');
const { setIsSearchActive } = useContext(SearchContext);
const [openGroup, setOpenGroup] = useState('');
const router = useRouter();
const lang = router.locale ?? '';
@@ -50,7 +52,12 @@ export default function SideNavigationPanel({ user }: { user?: MscrUser }) {
selected={router.asPath.startsWith(personalSchemasPath)}
content={
<Link href={personalSchemasPath} passHref>
<RouterLink onClick={() => setOpenGroup('')}>
<RouterLink
onClick={() => {
setOpenGroup('');
setIsSearchActive(false);
}}
>
{t('workspace.schemas')}
</RouterLink>
</Link>
@@ -62,7 +69,12 @@ export default function SideNavigationPanel({ user }: { user?: MscrUser }) {
selected={router.asPath.startsWith(personalCrosswalksPath)}
content={
<Link href={personalCrosswalksPath} passHref>
<RouterLink onClick={() => setOpenGroup('')}>
<RouterLink
onClick={() => {
setOpenGroup('');
setIsSearchActive(false);
}}
>
{t('workspace.crosswalks')}
</RouterLink>
</Link>
@@ -119,24 +131,32 @@ export default function SideNavigationPanel({ user }: { user?: MscrUser }) {
selected={router.asPath.startsWith('/' + group.id + '/schemas')}
content={
<Link href={'/' + group.id + '/schemas'} passHref>
<RouterLink>{t('workspace.schemas')}</RouterLink>
<RouterLink onClick={() => setIsSearchActive(false)}>
{t('workspace.schemas')}
</RouterLink>
</Link>
}
/>
<MscrSideNavigationLevel3
className="group"
subLevel={3}
selected={router.asPath.startsWith('/' + group.id + '/crosswalks')}
selected={router.asPath.startsWith(
'/' + group.id + '/crosswalks'
)}
content={
<Link href={'/' + group.id + '/crosswalks'} passHref>
<RouterLink>{t('workspace.crosswalks')}</RouterLink>
<RouterLink onClick={() => setIsSearchActive(false)}>
{t('workspace.crosswalks')}
</RouterLink>
</Link>
}
/>
<MscrSideNavigationLevel3
className="group"
subLevel={3}
selected={router.asPath.startsWith('/' + group.id + '/settings')}
selected={router.asPath.startsWith(
'/' + group.id + '/settings'
)}
content={''}
// content={
// <Link href={'/' + group.id + '/settings'} passHref>

0 comments on commit 30cbce5

Please sign in to comment.