From f6c717582870692c48dfd6390176b08efad968a0 Mon Sep 17 00:00:00 2001 From: lyzno1 <92089059+lyzno1@users.noreply.github.com> Date: Thu, 7 Aug 2025 09:25:26 +0800 Subject: [PATCH] fix: make TagSelector always visible for accessibility and mobile support (#23515) --- .../datasets/{Container.tsx => container.tsx} | 6 +++--- .../datasets/{DatasetCard.tsx => dataset-card.tsx} | 11 +++-------- .../{DatasetFooter.tsx => dataset-footer.tsx} | 0 .../datasets/{Datasets.tsx => datasets.tsx} | 4 ++-- web/app/(commonLayout)/datasets/{Doc.tsx => doc.tsx} | 0 .../{NewDatasetCard.tsx => new-dataset-card.tsx} | 0 web/app/(commonLayout)/datasets/page.tsx | 2 +- web/app/components/apps/app-card.tsx | 12 +++--------- web/app/components/base/tag-management/selector.tsx | 6 +++++- web/service/access-control.ts | 4 ++-- 10 files changed, 19 insertions(+), 26 deletions(-) rename web/app/(commonLayout)/datasets/{Container.tsx => container.tsx} (98%) rename web/app/(commonLayout)/datasets/{DatasetCard.tsx => dataset-card.tsx} (94%) rename web/app/(commonLayout)/datasets/{DatasetFooter.tsx => dataset-footer.tsx} (100%) rename web/app/(commonLayout)/datasets/{Datasets.tsx => datasets.tsx} (96%) rename web/app/(commonLayout)/datasets/{Doc.tsx => doc.tsx} (100%) rename web/app/(commonLayout)/datasets/{NewDatasetCard.tsx => new-dataset-card.tsx} (100%) diff --git a/web/app/(commonLayout)/datasets/Container.tsx b/web/app/(commonLayout)/datasets/container.tsx similarity index 98% rename from web/app/(commonLayout)/datasets/Container.tsx rename to web/app/(commonLayout)/datasets/container.tsx index 112b6a752..444119332 100644 --- a/web/app/(commonLayout)/datasets/Container.tsx +++ b/web/app/(commonLayout)/datasets/container.tsx @@ -9,10 +9,10 @@ import { useQuery } from '@tanstack/react-query' // Components import ExternalAPIPanel from '../../components/datasets/external-api/external-api-panel' -import Datasets from './Datasets' -import DatasetFooter from './DatasetFooter' +import Datasets from './datasets' +import DatasetFooter from './dataset-footer' import ApiServer from '../../components/develop/ApiServer' -import Doc from './Doc' +import Doc from './doc' import TabSliderNew from '@/app/components/base/tab-slider-new' import TagManagementModal from '@/app/components/base/tag-management' import TagFilter from '@/app/components/base/tag-management/filter' diff --git a/web/app/(commonLayout)/datasets/DatasetCard.tsx b/web/app/(commonLayout)/datasets/dataset-card.tsx similarity index 94% rename from web/app/(commonLayout)/datasets/DatasetCard.tsx rename to web/app/(commonLayout)/datasets/dataset-card.tsx index 4b40be2c7..58c82984e 100644 --- a/web/app/(commonLayout)/datasets/DatasetCard.tsx +++ b/web/app/(commonLayout)/datasets/dataset-card.tsx @@ -162,24 +162,19 @@ const DatasetCard = ({
{dataset.description}
-
+
{ e.stopPropagation() e.preventDefault() }}>
{ diff --git a/web/app/components/apps/app-card.tsx b/web/app/components/apps/app-card.tsx index 603b5922c..a91c2edf1 100644 --- a/web/app/components/apps/app-card.tsx +++ b/web/app/components/apps/app-card.tsx @@ -370,20 +370,14 @@ const AppCard = ({ app, onRefresh }: AppCardProps) => { {app.description}
-
+
{isCurrentWorkspaceEditor && ( <>
{ e.stopPropagation() e.preventDefault() }}> -
+
{ />
-
+
} diff --git a/web/app/components/base/tag-management/selector.tsx b/web/app/components/base/tag-management/selector.tsx index 026543cfa..cb53aaa7e 100644 --- a/web/app/components/base/tag-management/selector.tsx +++ b/web/app/components/base/tag-management/selector.tsx @@ -238,12 +238,16 @@ const TagSelector: FC = ({ }, [selectedTags, tagList]) const Trigger = () => { + const hasNoTags = !triggerContent return (
-
+
{!triggerContent ? t('common.tag.addTag') : triggerContent}
diff --git a/web/service/access-control.ts b/web/service/access-control.ts index d4cc9eb79..18dc9e000 100644 --- a/web/service/access-control.ts +++ b/web/service/access-control.ts @@ -70,7 +70,7 @@ export const useUpdateAccessMode = () => { }) } -export const useGetUserCanAccessApp = ({ appId, isInstalledApp = true }: { appId?: string; isInstalledApp?: boolean; }) => { +export const useGetUserCanAccessApp = ({ appId, isInstalledApp = true, enabled }: { appId?: string; isInstalledApp?: boolean; enabled?: boolean }) => { const systemFeatures = useGlobalPublicStore(s => s.systemFeatures) return useQuery({ queryKey: [NAME_SPACE, 'user-can-access-app', appId], @@ -80,7 +80,7 @@ export const useGetUserCanAccessApp = ({ appId, isInstalledApp = true }: { appId else return { result: true } }, - enabled: !!appId, + enabled: enabled !== undefined ? enabled : !!appId, staleTime: 0, gcTime: 0, })