refactor: refactor navigation handling in dataset components to use button elements

pull/21398/head
twwu 12 months ago
parent 80875a109a
commit 4ae936b263

@ -1,23 +1,28 @@
import React from 'react' import React, { useCallback } from 'react'
import { RiArrowLeftLine } from '@remixicon/react' import { RiArrowLeftLine } from '@remixicon/react'
import Button from '../../base/button' import Button from '../../base/button'
import { useTranslation } from 'react-i18next' import { useTranslation } from 'react-i18next'
import { useRouter } from 'next/navigation'
const Header = () => { const Header = () => {
const { t } = useTranslation() const { t } = useTranslation()
const { push } = useRouter()
const goBack = useCallback(() => {
push('/datasets')
}, [push])
return ( return (
<div className='system-md-semibold relative flex px-16 pb-2 pt-5 text-text-primary'> <div className='system-md-semibold relative flex px-16 pb-2 pt-5 text-text-primary'>
<span>{t('datasetPipeline.creation.title')}</span> <span>{t('datasetPipeline.creation.title')}</span>
<a <Button
className='absolute bottom-0 left-5' variant='secondary-accent'
href='/datasets' className='absolute bottom-0 left-5 size-9 rounded-full p-0'
> onClick={goBack}
<Button variant='secondary-accent' className='size-9 rounded-full p-0'> >
<RiArrowLeftLine className='size-5 ' /> <RiArrowLeftLine className='size-5 ' />
</Button> </Button>
</a> </div>
</div>
) )
} }

@ -1,7 +1,7 @@
import React from 'react' import React, { useCallback } from 'react'
import { RiArrowLeftLine } from '@remixicon/react' import { RiArrowLeftLine } from '@remixicon/react'
import Button from '@/app/components/base/button' import Button from '@/app/components/base/button'
import { useParams } from 'next/navigation' import { useParams, useRouter } from 'next/navigation'
import Effect from '@/app/components/base/effect' import Effect from '@/app/components/base/effect'
import type { Step } from './step-indicator' import type { Step } from './step-indicator'
import StepIndicator from './step-indicator' import StepIndicator from './step-indicator'
@ -18,6 +18,12 @@ const LeftHeader = ({
currentStep, currentStep,
}: LeftHeaderProps) => { }: LeftHeaderProps) => {
const { datasetId } = useParams() const { datasetId } = useParams()
const { push } = useRouter()
const goBack = useCallback(() => {
if (datasetId)
push(`/datasets/${datasetId}/documents`)
}, [datasetId, push])
return ( return (
<div className='relative flex flex-col gap-y-0.5 pb-2 pt-4'> <div className='relative flex flex-col gap-y-0.5 pb-2 pt-4'>
@ -32,14 +38,13 @@ const LeftHeader = ({
{steps[currentStep - 1]?.label} {steps[currentStep - 1]?.label}
</div> </div>
{currentStep !== steps.length && ( {currentStep !== steps.length && (
<a <Button
className='absolute -left-11 top-3.5' variant='secondary-accent'
href={`/datasets/${datasetId}/documents`} className='absolute -left-11 top-3.5 size-9 rounded-full p-0'
onClick={goBack}
> >
<Button variant='secondary-accent' className='size-9 rounded-full p-0'> <RiArrowLeftLine className='size-5 ' />
<RiArrowLeftLine className='size-5 ' /> </Button>
</Button>
</a>
)} )}
<Effect className='left-8 top-[-34px] opacity-20' /> <Effect className='left-8 top-[-34px] opacity-20' />
</div> </div>

@ -1,7 +1,6 @@
'use client' 'use client'
import React from 'react' import React from 'react'
import { useTranslation } from 'react-i18next' import { useTranslation } from 'react-i18next'
import { basePath } from '@/utils/var'
import { import {
RiAddLine, RiAddLine,
RiFunctionAddLine, RiFunctionAddLine,
@ -15,11 +14,23 @@ const CreateAppCard = () => {
return ( return (
<div className='flex h-[166px] flex-col gap-y-0.5 rounded-xl bg-background-default-dimmed'> <div className='flex h-[166px] flex-col gap-y-0.5 rounded-xl bg-background-default-dimmed'>
<div className='flex grow flex-col items-center justify-center p-2'> <div className='flex grow flex-col items-center justify-center p-2'>
<Link href={`${basePath}/datasets/create-from-pipeline`} Icon={RiFunctionAddLine} text={t('dataset.createFromPipeline')} /> <Link
<Link href={`${basePath}/datasets/create`} Icon={RiAddLine} text={t('dataset.createDataset')} /> href={'/datasets/create-from-pipeline'}
Icon={RiFunctionAddLine}
text={t('dataset.createFromPipeline')}
/>
<Link
href={'/datasets/create'}
Icon={RiAddLine}
text={t('dataset.createDataset')}
/>
</div> </div>
<div className='border-t-[0.5px] border-divider-subtle p-2'> <div className='border-t-[0.5px] border-divider-subtle p-2'>
<Link href={`${basePath}/datasets/connect`} Icon={ApiConnectionMod} text={t('dataset.connectDataset')} /> <Link
href={'/datasets/connect'}
Icon={ApiConnectionMod}
text={t('dataset.connectDataset')}
/>
</div> </div>
</div> </div>
) )

@ -1,27 +1,32 @@
import { useRouter } from 'next/navigation'
import React from 'react' import React from 'react'
type LinkProps = { type LinkProps = {
Icon: React.ComponentType<{ className?: string }> Icon: React.ComponentType<{ className?: string }>
text: string text: string
href: string href: string
ref?: React.RefObject<HTMLAnchorElement>
} }
const Link = ({ const Link = ({
Icon, Icon,
text, text,
href, href,
ref,
}: LinkProps) => { }: LinkProps) => {
const { push } = useRouter()
const navigateTo = () => {
push(href)
}
return ( return (
<a <button
ref={ref} type='button'
className='flex w-full items-center gap-x-2 rounded-lg bg-transparent px-4 py-2 text-text-tertiary shadow-shadow-shadow-3 hover:bg-background-default-dodge hover:text-text-secondary hover:shadow-xs' className='flex w-full items-center gap-x-2 rounded-lg bg-transparent px-4 py-2 text-text-tertiary shadow-shadow-shadow-3 hover:bg-background-default-dodge hover:text-text-secondary hover:shadow-xs'
href={href} onClick={navigateTo}
> >
<Icon className='h-4 w-4 shrink-0' /> <Icon className='h-4 w-4 shrink-0' />
<span className='system-sm-medium grow'>{text}</span> <span className='system-sm-medium grow text-left'>{text}</span>
</a> </button>
) )
} }

Loading…
Cancel
Save