Build Agentic workflows, RAG pipelines, with rich AI model and tool support on one collaborative workspace. Deploy on cloud, VPC, or self-hosted, so teams move from prototype to production without rebuilding the stack.
Python agentagentic-aiagentic-frameworkagentic-workflowaiautomationclaudedeepseekgenaigptllmlow-codemcpnextjsno-codeopenaipythonskillsworkflow
refactor(web): simplify tag selector trigger (#40014)
yyhc15dd6d99450
diff --git a/oxlint-suppressions.json b/oxlint-suppressions.jsonindex b7cecd053ff..499be156a77 100644--- a/oxlint-suppressions.json+++ b/oxlint-suppressions.json@@ -710,14 +710,8 @@}},"web/app/components/apps/app-card.tsx": {- "jsx_a11y/click-events-have-key-events": {- "count": 1- },"jsx_a11y/no-noninteractive-element-to-interactive-role": {"count": 1- },- "jsx_a11y/no-static-element-interactions": {- "count": 1}},"web/app/components/apps/import-from-marketplace-template-modal.tsx": {@@ -2721,14 +2715,6 @@"count": 1}},- "web/app/components/datasets/list/dataset-card/__tests__/index.spec.tsx": {- "jsx_a11y/click-events-have-key-events": {- "count": 1- },- "jsx_a11y/no-static-element-interactions": {- "count": 1- }- },"web/app/components/datasets/list/dataset-card/components/operations-dropdown.tsx": {"jsx_a11y/click-events-have-key-events": {"count": 1@@ -5865,14 +5851,6 @@"count": 1}},- "web/features/tag-management/components/dataset-card-tags.tsx": {- "jsx_a11y/click-events-have-key-events": {- "count": 1- },- "jsx_a11y/no-static-element-interactions": {- "count": 1- }- },"web/features/tag-management/components/tag-item-editor.tsx": {"jsx_a11y/no-autofocus": {"count": 1diff --git a/web/app/components/apps/app-card.tsx b/web/app/components/apps/app-card.tsxindex 0900894bd18..44d74c6d966 100644--- a/web/app/components/apps/app-card.tsx+++ b/web/app/components/apps/app-card.tsx@@ -1227,21 +1227,6 @@ export function AppCard({{appCardContent}</Link>)}- <div- className="absolute top-26 right-3 left-3 flex h-6.5 min-w-0 items-start"- onClick={(e) => {- e.stopPropagation()- e.preventDefault()- }}- >- <AppCardTags- appId={app.id}- tags={app.tags}- canBindOrUnbindTags={canBindOrUnbindTags}- onOpenTagManagement={onOpenTagManagement}- onTagsChange={onRefresh}- />- </div><AppAccessModeIcon accessMode={app.access_mode} />{!isPreviewOnly && (<div@@ -1360,6 +1345,15 @@ export function AppCard({)}</div>)}+ <div className="absolute top-26 right-3 left-3 flex h-6.5 min-w-0 items-start">+ <AppCardTags+ appId={app.id}+ tags={app.tags}+ canBindOrUnbindTags={canBindOrUnbindTags}+ onOpenTagManagement={onOpenTagManagement}+ onTagsChange={onRefresh}+ />+ </div></div>{showEditModal && (<EditAppModaldiff --git a/web/app/components/datasets/list/dataset-card/__tests__/index.spec.tsx b/web/app/components/datasets/list/dataset-card/__tests__/index.spec.tsxindex 0700aad29cc..bad3ea21884 100644--- a/web/app/components/datasets/list/dataset-card/__tests__/index.spec.tsx+++ b/web/app/components/datasets/list/dataset-card/__tests__/index.spec.tsx@@ -120,17 +120,11 @@ vi.mock('../components/dataset-card-modals', () => ({),}))vi.mock('@/features/tag-management/components/dataset-card-tags', () => ({- DatasetCardTags: ({- onClick,- canBindOrUnbindTags,- }: {- onClick: (e: React.MouseEvent) => void- canBindOrUnbindTags?: boolean- }) => (- <div+ DatasetCardTags: ({ canBindOrUnbindTags }: { canBindOrUnbindTags?: boolean }) => (+ <button+ type="button"data-testid="tag-area"data-can-bind-or-unbind-tags={String(Boolean(canBindOrUnbindTags))}- onClick={onClick}/>),}))@@ -395,11 +389,6 @@ describe('DatasetCard Component', () => {expect(tagArea).toHaveAttribute('data-can-bind-or-unbind-tags', 'false')expect(screen.queryByTestId('operations-dropdown')).not.toBeInTheDocument()- fireEvent.click(tagArea)-- expect(mockPush).not.toHaveBeenCalled()- expect(toastMocks.record).not.toHaveBeenCalled()-fireEvent.click(card)expect(mockPush).not.toHaveBeenCalled()@@ -478,16 +467,6 @@ describe('DatasetCard Component', () => {expect(mockPush).toHaveBeenCalledWith('/datasets/dataset-1/pipeline')})- it('should stop propagation when tag area is clicked', () => {- const dataset = createMockDataset()- render(<DatasetCard dataset={dataset} />)-- const tagArea = screen.getByTestId('tag-area')- fireEvent.click(tagArea)- // Tag area click should not trigger card navigation- expect(mockPush).not.toHaveBeenCalled()- })-it('should allow tag binding when dataset has edit ACL', () => {const dataset = createMockDataset({ permission_keys: ['dataset.acl.edit'] })diff --git a/web/app/components/datasets/list/dataset-card/index.tsx b/web/app/components/datasets/list/dataset-card/index.tsxindex 452405189e8..6a8591614bf 100644--- a/web/app/components/datasets/list/dataset-card/index.tsx+++ b/web/app/components/datasets/list/dataset-card/index.tsx@@ -108,10 +108,6 @@ const DatasetCard = ({showPreviewOnlyAccessWarning()}- const handleTagAreaClick = (e: MouseEvent) => {- e.stopPropagation()- e.preventDefault()- }const cardClassName = cn('group relative col-span-1 flex h-41.5 flex-col overflow-hidden rounded-xl border-[0.5px] border-solid border-components-card-border bg-components-card-bg shadow-xs shadow-shadow-shadow-3 transition-[background-color,box-shadow] duration-200 ease-in-out',isPreviewOnly@@ -139,7 +135,6 @@ const DatasetCard = ({datasetId={dataset.id}embeddingAvailable={dataset.embedding_available}tags={dataset.tags}- onClick={handleTagAreaClick}onOpenTagManagement={onOpenTagManagement}onTagsChange={onSuccess}canBindOrUnbindTags={canBindOrUnbindTags}diff --git a/web/app/components/snippet-list/components/snippet-card.tsx b/web/app/components/snippet-list/components/snippet-card.tsxindex 12914ba21e5..438f03d61e9 100644--- a/web/app/components/snippet-list/components/snippet-card.tsx+++ b/web/app/components/snippet-list/components/snippet-card.tsx@@ -175,7 +175,7 @@ const SnippetCard = ({<div className="absolute right-0 bottom-1 left-0 flex h-10.5 shrink-0 items-center pt-1 pr-1.5 pb-1.5 pl-3.5"><div className="flex w-0 grow items-center gap-1">- <div className="mr-10.25 min-w-0 grow overflow-hidden">+ <div className="mr-10.25 min-w-0 grow"><TagSelectorplacement="bottom-start"type="snippet"diff --git a/web/features/tag-management/__tests__/tag-selector.spec.tsx b/web/features/tag-management/__tests__/tag-selector.spec.tsxindex 1277caab23b..8ded87ed0bc 100644--- a/web/features/tag-management/__tests__/tag-selector.spec.tsx+++ b/web/features/tag-management/__tests__/tag-selector.spec.tsx@@ -1,8 +1,9 @@import type { TagResponse as Tag } from '@dify/contracts/api/console/tags/types.gen'-import type { ComponentProps } from 'react'+import type { TagSelectorProps } from '../components/tag-selector'import { screen, waitFor } from '@testing-library/react'import userEvent from '@testing-library/user-event'import { render } from '@/test/console/render'+import { DatasetCardTags } from '../components/dataset-card-tags'import { TagSelector } from '../components/tag-selector'const { mockToast } = vi.hoisted(() => {@@ -123,7 +124,7 @@ const defaultProps = {targetId: 'target-1',type: 'app',value: [appTags[0]!],-} satisfies ComponentProps<typeof TagSelector>+} satisfies TagSelectorPropsdescribe('TagSelector', () => {beforeEach(() => {@@ -149,6 +150,23 @@ describe('TagSelector', () => {expect(screen.getByText('Frontend')).toBeInTheDocument()})+ it('keeps dataset tag interactions inside the tag trigger', async () => {+ const user = userEvent.setup()+ const onOuterClick = vi.fn()+ mockUseQueryData.current = []++ document.addEventListener('click', onOuterClick)+ try {+ render(<DatasetCardTags datasetId="dataset-1" embeddingAvailable tags={[]} />)++ await user.click(screen.getByRole('combobox', { name: i18n.noTag }))++ expect(onOuterClick).not.toHaveBeenCalled()+ } finally {+ document.removeEventListener('click', onOuterClick)+ }+ })+it('renders the no tag trigger when no current tag is visible and binding is unavailable', () => {render(<TagSelectordiff --git a/web/features/tag-management/components/app-card-tags.tsx b/web/features/tag-management/components/app-card-tags.tsxindex 2187f4615d9..295862edff3 100644--- a/web/features/tag-management/components/app-card-tags.tsx+++ b/web/features/tag-management/components/app-card-tags.tsx@@ -17,17 +17,14 @@ export const AppCardTags = ({onTagsChange,}: AppCardTagsProps) => {return (- <div className="group/tag-area relative w-full min-w-0 overflow-hidden">- <TagSelector- placement="bottom-start"- type="app"- targetId={appId}- value={tags}- canBindOrUnbindTags={canBindOrUnbindTags}- onOpenTagManagement={onOpenTagManagement}- onTagsChange={onTagsChange}- />- <div className="pointer-events-none absolute top-0 right-0 h-full w-20 bg-tag-selector-mask-bg group-focus-within/tag-area:hidden group-hover/tag-area:hidden" />- </div>+ <TagSelector+ placement="bottom-start"+ type="app"+ targetId={appId}+ value={tags}+ canBindOrUnbindTags={canBindOrUnbindTags}+ onOpenTagManagement={onOpenTagManagement}+ onTagsChange={onTagsChange}+ />)}diff --git a/web/features/tag-management/components/dataset-card-tags.tsx b/web/features/tag-management/components/dataset-card-tags.tsxindex 3978d5475ef..6e11b20a5bc 100644--- a/web/features/tag-management/components/dataset-card-tags.tsx+++ b/web/features/tag-management/components/dataset-card-tags.tsx@@ -1,5 +1,4 @@import type { TagResponse as Tag } from '@dify/contracts/api/console/tags/types.gen'-import type { MouseEvent } from 'react'import { cn } from '@langgenius/dify-ui/cn'import { TagSelector } from '@/features/tag-management/components/tag-selector'@@ -7,7 +6,6 @@ type DatasetCardTagsProps = {datasetId: stringembeddingAvailable: booleantags: Tag[]- onClick: (e: MouseEvent) => voidonOpenTagManagement?: () => voidonTagsChange?: () => voidcanBindOrUnbindTags?: boolean@@ -17,27 +15,19 @@ export const DatasetCardTags = ({datasetId,embeddingAvailable,tags,- onClick,onOpenTagManagement = () => {},onTagsChange,canBindOrUnbindTags,}: DatasetCardTagsProps) => (- <div- className={cn('group/tag-area w-full px-3', !embeddingAvailable && 'opacity-30')}- onClick={onClick}- >- <div className="relative w-full overflow-hidden">- <TagSelector- placement="bottom-start"- type="knowledge"- targetId={datasetId}- value={tags}- onOpenTagManagement={onOpenTagManagement}- onTagsChange={onTagsChange}- canBindOrUnbindTags={canBindOrUnbindTags}- />- <div className="pointer-events-none absolute top-0 right-0 h-full w-20 bg-tag-selector-mask-bg group-focus-within/tag-area:hidden group-hover/tag-area:hidden" />- <div className="pointer-events-none absolute top-0 right-0 h-full w-20 bg-tag-selector-mask-bg group-focus-within/tag-area:hidden group-hover/tag-area:hidden" />- </div>- </div>+ <TagSelector+ placement="bottom-start"+ type="knowledge"+ targetId={datasetId}+ value={tags}+ onOpenTagManagement={onOpenTagManagement}+ onTagsChange={onTagsChange}+ canBindOrUnbindTags={canBindOrUnbindTags}+ className={cn('mx-3 w-auto', !embeddingAvailable && 'opacity-30')}+ onClick={(event) => event.stopPropagation()}+ />)diff --git a/web/features/tag-management/components/tag-selector.tsx b/web/features/tag-management/components/tag-selector.tsxindex 5ebeb6782c1..9373debe15e 100644--- a/web/features/tag-management/components/tag-selector.tsx+++ b/web/features/tag-management/components/tag-selector.tsx@@ -1,5 +1,9 @@import type { TagResponse as Tag, TagType } from '@dify/contracts/api/console/tags/types.gen'-import type { ComboboxContentProps, ComboboxProps } from '@langgenius/dify-ui/combobox'+import type {+ ComboboxContentProps,+ ComboboxProps,+ ComboboxTriggerProps,+} from '@langgenius/dify-ui/combobox'import type { TagComboboxItem } from './tag-combobox-item'import { cn } from '@langgenius/dify-ui/cn'import { Combobox, ComboboxContent, ComboboxTrigger } from '@langgenius/dify-ui/combobox'@@ -15,7 +19,7 @@ import { useApplyTagBindingsMutation } from '../hooks/use-tag-mutations'import { getTagManagePermissionKey } from '../utils'import { isCreateTagOption } from './tag-combobox-item'import { TagSearchContent } from './tag-search-content'-import { TagTrigger } from './tag-trigger'+import { TagTriggerContent } from './tag-trigger-content'const TAG_COMBOBOX_FILTER: NonNullable<ComboboxProps<TagComboboxItem, true>['filter']> = (tag,@@ -53,9 +57,9 @@ type TagSelectorContentProps = Pick<| 'popupProps'| 'popupClassName'>--type TagSelectorProps = TagSelectorRootProps &- TagSelectorContentProps & {+export type TagSelectorProps = TagSelectorRootProps &+ TagSelectorContentProps &+ Pick<ComboboxTriggerProps, 'className' | 'onClick'> & {targetId: stringtype: TagTypevalue: Tag[]@@ -69,6 +73,8 @@ export const TagSelector = ({type,value,canBindOrUnbindTags,+ className,+ onClick,onOpenTagManagement = () => {},onTagsChange,placement = 'bottom-start',@@ -256,11 +262,17 @@ export const TagSelector = ({disabled={!canManageTags && !canBindOrUnbindTags}aria-label={triggerLabel}className={cn(- 'block h-auto w-full rounded-lg border-0 bg-transparent p-0 text-left hover:bg-transparent focus:outline-hidden focus-visible:bg-transparent data-popup-open:bg-state-base-hover data-popup-open:hover:bg-state-base-hover',+ 'group/tag-area relative h-auto w-full cursor-pointer rounded-lg border-0 bg-transparent p-1 hover:bg-state-base-hover focus-visible:bg-transparent data-disabled:bg-transparent data-disabled:opacity-50 data-disabled:hover:bg-transparent data-popup-open:bg-state-base-hover data-popup-open:hover:bg-state-base-hover',+ className,)}icon={false}+ onClick={onClick}>- <TagTrigger tags={tagNames} canBindOrUnbindTags={canBindOrUnbindTags} />+ <TagTriggerContent tags={tagNames} emptyLabel={emptyTriggerLabel} />+ <span+ aria-hidden="true"+ className="pointer-events-none absolute top-0 right-0 h-full w-20 bg-tag-selector-mask-bg group-hover/tag-area:hidden group-focus-visible/tag-area:hidden group-data-popup-open/tag-area:hidden"+ /></ComboboxTrigger><ComboboxContentplacement={placement}diff --git a/web/features/tag-management/components/tag-trigger-content.tsx b/web/features/tag-management/components/tag-trigger-content.tsxnew file mode 100644index 00000000000..d65a3c81f0b--- /dev/null+++ b/web/features/tag-management/components/tag-trigger-content.tsx@@ -0,0 +1,33 @@+type TagTriggerContentProps = {+ tags: string[]+ emptyLabel: string+}++export const TagTriggerContent = ({ tags, emptyLabel }: TagTriggerContentProps) => {+ return (+ <span aria-hidden="true" className="flex w-full min-w-0 items-center gap-1">+ {!tags.length ? (+ <span className="flex max-w-full min-w-0 items-center gap-x-0.5 rounded-[5px] border border-dashed border-divider-deep bg-components-badge-bg-dimm px-1.25 py-0.75">+ <span className="i-ri-price-tag-3-line size-3 shrink-0 text-text-quaternary" />+ <span className="truncate system-2xs-medium-uppercase text-text-tertiary">+ {emptyLabel}+ </span>+ </span>+ ) : (+ <>+ {tags.map((content) => (+ <span+ key={content}+ className="flex max-w-30 min-w-0 shrink-0 items-center gap-x-0.5 rounded-[5px] border border-divider-deep bg-components-badge-bg-dimm px-1.25 py-0.75"+ >+ <span className="i-ri-price-tag-3-line size-3 shrink-0 text-text-quaternary" />+ <span className="truncate system-2xs-medium-uppercase text-text-tertiary">+ {content}+ </span>+ </span>+ ))}+ </>+ )}+ </span>+ )+}diff --git a/web/features/tag-management/components/tag-trigger.tsx b/web/features/tag-management/components/tag-trigger.tsxdeleted file mode 100644index 45005855d5c..00000000000--- a/web/features/tag-management/components/tag-trigger.tsx+++ /dev/null@@ -1,56 +0,0 @@-import { cn } from '@langgenius/dify-ui/cn'-import { useTranslation } from 'react-i18next'--type TriggerProps = {- tags: string[]- canBindOrUnbindTags?: boolean-}--export const TagTrigger = ({ tags, canBindOrUnbindTags = false }: TriggerProps) => {- const { t } = useTranslation()- const emptyTagLabel = canBindOrUnbindTags- ? t(($) => $['tag.addTag'], { ns: 'common' })- : t(($) => $['tag.noTag'], { ns: 'common' })-- return (- <div- className={cn(- 'flex w-full cursor-pointer items-center gap-1 overflow-hidden rounded-lg p-1 hover:bg-state-base-hover',- !canBindOrUnbindTags && 'pointer-events-none opacity-50',- )}- role={tags.length ? 'list' : undefined}- >- {!tags.length ? (- <div className="flex max-w-full min-w-0 items-center gap-x-0.5 rounded-[5px] border border-dashed border-divider-deep bg-components-badge-bg-dimm px-1.25 py-0.75">- <span- aria-hidden="true"- className="i-ri-price-tag-3-line size-3 shrink-0 text-text-quaternary"- />- <div className="truncate system-2xs-medium-uppercase text-text-tertiary">- {emptyTagLabel}- </div>- </div>- ) : (- <>- {tags.map((content) => {- return (- <div- key={content}- role="listitem"- className="flex max-w-30 min-w-0 shrink-0 items-center gap-x-0.5 rounded-[5px] border border-divider-deep bg-components-badge-bg-dimm px-1.25 py-0.75"- >- <span- aria-hidden="true"- className="i-ri-price-tag-3-line size-3 shrink-0 text-text-quaternary"- />- <div className="truncate system-2xs-medium-uppercase text-text-tertiary">- {content}- </div>- </div>- )- })}- </>- )}- </div>- )-}