opensource/dify
2
0
Fork 0
mirror of https://github.com/langgenius/dify.git synced 2026-07-21 10:38:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: simplify help menu upgrade item (#38635)

Browse Source
This commit is contained in:
yyh 2026-07-10 11:58:27 +08:00 committed by GitHub
parent 888bea9911
commit c3fb5344cb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
web/app/components/main-nav/__tests__/index.spec.tsx
View File

@ -678,9 +678,12 @@ describe('MainNav', () => {
renderMainNav()
fireEvent.click(screen.getByRole('button', { name: 'common.mainNav.help.openMenu' }))
expect(await screen.findByText('common.userProfile.contactUs')).toBeInTheDocument()
const contactUsItem = await screen.findByRole('menuitem', {
name: 'common.userProfile.contactUs billing.upgradeBtn.encourageShort',
})
expect(screen.queryByRole('button', { name: 'billing.upgradeBtn.encourageShort' })).not.toBeInTheDocument()
fireEvent.click(screen.getByRole('button', { name: 'billing.upgradeBtn.encourageShort' }))
fireEvent.click(contactUsItem)
await waitFor(() => {
expect(screen.queryByText('common.userProfile.forum')).not.toBeInTheDocument()

6
web/app/components/main-nav/components/__tests__/support-menu.spec.tsx
View File

@ -142,14 +142,10 @@ describe('SupportMenu', () => {
expect(screen.getByText('common.userProfile.contactUs')).toHaveClass('text-text-disabled')
expect(screen.getByText('billing.upgradeBtn.encourageShort')).toHaveClass('system-xs-semibold-uppercase', 'text-saas-dify-blue-accessible')
expect(screen.queryByText('common.userProfile.emailSupport')).not.toBeInTheDocument()
expect(screen.queryByRole('button', { name: 'billing.upgradeBtn.encourageShort' })).not.toBeInTheDocument()
fireEvent.click(screen.getByRole('menuitem', { name: 'common.userProfile.contactUs billing.upgradeBtn.encourageShort' }))
expect(mockSetShowPricingModal).not.toHaveBeenCalled()
expect(onContactUsClick).not.toHaveBeenCalled()
fireEvent.click(screen.getByRole('button', { name: 'billing.upgradeBtn.encourageShort' }))
expect(mockSetShowPricingModal).toHaveBeenCalled()
expect(openZendeskWindow).not.toHaveBeenCalled()
expect(onContactUsClick).toHaveBeenCalled()

21
web/app/components/main-nav/components/support-menu.tsx
View File

@ -29,9 +29,11 @@ export default function SupportMenu({ onContactUsClick }: SupportMenuProps) {
<>
{shouldShowUpgradeContact && (
<DropdownMenuItem
className="mx-0 h-8 cursor-default gap-1 px-3 py-1"
onClick={(event) => {
event.preventDefault()
aria-label={`${t('userProfile.contactUs', { ns: 'common' })} ${t('upgradeBtn.encourageShort', { ns: 'billing' })}`}
className="mx-0 h-8 gap-1 px-3 py-1"
onClick={() => {
setShowPricingModal()
onContactUsClick?.()
}}
>
<MenuItemContent
@ -42,17 +44,12 @@ export default function SupportMenu({ onContactUsClick }: SupportMenuProps) {
</span>
)}
trailing={(
<button
type="button"
className="max-w-30 shrink-0 truncate px-1 system-xs-semibold-uppercase text-saas-dify-blue-accessible transition-colors hover:text-saas-dify-blue-static-hover focus-visible:inset-ring-2 focus-visible:inset-ring-state-accent-solid focus-visible:outline-hidden"
onClick={(event) => {
event.stopPropagation()
setShowPricingModal()
onContactUsClick?.()
}}
<span
aria-hidden
className="max-w-30 shrink-0 truncate px-1 system-xs-semibold-uppercase text-saas-dify-blue-accessible"
>
{t('upgradeBtn.encourageShort', { ns: 'billing' })}
</button>
</span>
)}
/>
</DropdownMenuItem>