Skip to content

Don't reload the page when clicking on a breadcrumb #228

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
merged 1 commit into from
May 15, 2023
Merged

Don't reload the page when clicking on a breadcrumb #228

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 23 additions & 0 deletions frontend/src/old-pages/Configure/Components.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ import {
Multiselect,
MultiselectProps,
ColumnLayout,
BreadcrumbGroupProps,
BreadcrumbGroup,
} from '@cloudscape-design/components'

// Components
Expand All @@ -59,6 +61,7 @@ import {
InstanceType,
InstanceTypeOption,
} from './Components.types'
import {useNavigate} from 'react-router-dom'

// Helper Functions
function strToOption(str: any) {
Expand Down Expand Up @@ -752,6 +755,26 @@ const CheckboxWithHelpPanel = ({
)
}

export const BreadcrumbGroupNavigate = ({
onFollow,
...props
}: BreadcrumbGroupProps) => {
const navigate = useNavigate()

const handleNavigate = React.useCallback(
event => {
event.preventDefault()
if (onFollow) {
onFollow(event)
} else {
navigate(event.detail.href)
}
},
[navigate, onFollow],
)
return <BreadcrumbGroup {...props} onFollow={handleNavigate} />
}

export {
SubnetSelect,
SecurityGroups,
Expand Down
6 changes: 3 additions & 3 deletions frontend/src/old-pages/Layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ import {
NonCancelableEventHandler,
} from '@cloudscape-design/components/internal/events'
import {BreadcrumbGroupProps} from '@cloudscape-design/components/breadcrumb-group/interfaces'
import BreadcrumbGroup from '@cloudscape-design/components/breadcrumb-group'
import {useTranslation} from 'react-i18next'
import map from 'lodash/map'
import {BreadcrumbGroupNavigate} from './Configure/Components'

type Slug = 'clusters' | 'images' | 'users' | 'clusterCreate' | 'clusterUpdate'
type BreadcrumbsProps = {
Expand Down Expand Up @@ -79,10 +79,10 @@ export function Breadcrumbs({
)

return (
<BreadcrumbGroup
<BreadcrumbGroupNavigate
items={items}
ariaLabel={t('global.menu.header')}
onClick={onClick}
onFollow={onClick}
/>
)
}
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/old-pages/Logs/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
// limitations under the License.

import {
BreadcrumbGroup,
BreadcrumbGroupProps,
ContentLayout,
Header,
Expand All @@ -26,6 +25,7 @@ import InfoLink from '../../components/InfoLink'
import Layout from '../Layout'
import {LogMessagesTable} from './LogMessagesTable'
import {LogStreamsTable} from './LogStreamsTable'
import {BreadcrumbGroupNavigate} from '../Configure/Components'

function LogsHelpPanel({clusterName}: {clusterName: string}) {
const {t} = useTranslation()
Expand Down Expand Up @@ -81,7 +81,7 @@ export function Logs() {
}, [])

return (
<Layout breadcrumbs={<BreadcrumbGroup items={breadcrumbItems} />}>
<Layout breadcrumbs={<BreadcrumbGroupNavigate items={breadcrumbItems} />}>
<ContentLayout
header={
<Header
Expand Down