From 2c95622890d09e7999d20f6801529bf0106f5fd2 Mon Sep 17 00:00:00 2001 From: Joel Date: Thu, 22 Jan 2026 15:47:28 +0800 Subject: [PATCH] chore: choose tools show --- .../workflow/block-selector/all-tools.tsx | 1 + .../tool/tool-list-flat-view/list.tsx | 3 ++ .../tool/tool-list-tree-view/item.tsx | 3 ++ .../tool/tool-list-tree-view/list.tsx | 3 ++ .../workflow/block-selector/tool/tool.tsx | 4 ++- .../workflow/block-selector/tools.tsx | 4 +++ .../plugins/tool-block/component.tsx | 34 ++++++++++++------- 7 files changed, 39 insertions(+), 13 deletions(-) diff --git a/web/app/components/workflow/block-selector/all-tools.tsx b/web/app/components/workflow/block-selector/all-tools.tsx index 627f790c54..c50cc20369 100644 --- a/web/app/components/workflow/block-selector/all-tools.tsx +++ b/web/app/components/workflow/block-selector/all-tools.tsx @@ -277,6 +277,7 @@ const AllTools = ({ viewType={isSupportGroupView ? activeView : ViewType.flat} hasSearchText={hasSearchText} selectedTools={selectedTools} + hideSelectedInfo={hideFeaturedTool} /> )} diff --git a/web/app/components/workflow/block-selector/tool/tool-list-flat-view/list.tsx b/web/app/components/workflow/block-selector/tool/tool-list-flat-view/list.tsx index 1852fc168a..d6d1ef2a2b 100644 --- a/web/app/components/workflow/block-selector/tool/tool-list-flat-view/list.tsx +++ b/web/app/components/workflow/block-selector/tool/tool-list-flat-view/list.tsx @@ -18,6 +18,7 @@ type Props = { letters: string[] toolRefs: any selectedTools?: ToolValue[] + hideSelectedInfo?: boolean } const ToolViewFlatView: FC = ({ @@ -31,6 +32,7 @@ const ToolViewFlatView: FC = ({ onSelectMultiple, toolRefs, selectedTools, + hideSelectedInfo, }) => { const firstLetterToolIds = useMemo(() => { const res: Record = {} @@ -61,6 +63,7 @@ const ToolViewFlatView: FC = ({ canNotSelectMultiple={canNotSelectMultiple} onSelectMultiple={onSelectMultiple} selectedTools={selectedTools} + hideSelectedInfo={hideSelectedInfo} /> ))} diff --git a/web/app/components/workflow/block-selector/tool/tool-list-tree-view/item.tsx b/web/app/components/workflow/block-selector/tool/tool-list-tree-view/item.tsx index 97049e5f79..3c06acef7a 100644 --- a/web/app/components/workflow/block-selector/tool/tool-list-tree-view/item.tsx +++ b/web/app/components/workflow/block-selector/tool/tool-list-tree-view/item.tsx @@ -14,6 +14,7 @@ type Props = { canNotSelectMultiple?: boolean onSelectMultiple?: (type: BlockEnum, tools: ToolDefaultValue[]) => void selectedTools?: ToolValue[] + hideSelectedInfo?: boolean } const Item: FC = ({ @@ -24,6 +25,7 @@ const Item: FC = ({ canNotSelectMultiple, onSelectMultiple, selectedTools, + hideSelectedInfo, }) => { return (
@@ -41,6 +43,7 @@ const Item: FC = ({ canNotSelectMultiple={canNotSelectMultiple} onSelectMultiple={onSelectMultiple} selectedTools={selectedTools} + hideSelectedInfo={hideSelectedInfo} /> ))}
diff --git a/web/app/components/workflow/block-selector/tool/tool-list-tree-view/list.tsx b/web/app/components/workflow/block-selector/tool/tool-list-tree-view/list.tsx index 944cc28547..0e4e1dce46 100644 --- a/web/app/components/workflow/block-selector/tool/tool-list-tree-view/list.tsx +++ b/web/app/components/workflow/block-selector/tool/tool-list-tree-view/list.tsx @@ -15,6 +15,7 @@ type Props = { canNotSelectMultiple?: boolean onSelectMultiple?: (type: BlockEnum, tools: ToolDefaultValue[]) => void selectedTools?: ToolValue[] + hideSelectedInfo?: boolean } const ToolListTreeView: FC = ({ @@ -24,6 +25,7 @@ const ToolListTreeView: FC = ({ canNotSelectMultiple, onSelectMultiple, selectedTools, + hideSelectedInfo, }) => { const { t } = useTranslation() const getI18nGroupName = useCallback((name: string) => { @@ -54,6 +56,7 @@ const ToolListTreeView: FC = ({ canNotSelectMultiple={canNotSelectMultiple} onSelectMultiple={onSelectMultiple} selectedTools={selectedTools} + hideSelectedInfo={hideSelectedInfo} /> ))} diff --git a/web/app/components/workflow/block-selector/tool/tool.tsx b/web/app/components/workflow/block-selector/tool/tool.tsx index b20818fdaa..5fa2da1abc 100644 --- a/web/app/components/workflow/block-selector/tool/tool.tsx +++ b/web/app/components/workflow/block-selector/tool/tool.tsx @@ -40,6 +40,7 @@ type Props = { onSelectMultiple?: (type: BlockEnum, tools: ToolDefaultValue[]) => void selectedTools?: ToolValue[] isShowLetterIndex?: boolean + hideSelectedInfo?: boolean } const Tool: FC = ({ @@ -51,6 +52,7 @@ const Tool: FC = ({ canNotSelectMultiple, onSelectMultiple, selectedTools, + hideSelectedInfo, }) => { const { t } = useTranslation() const { allowed: isMCPToolAllowed } = useMCPToolAvailability() @@ -226,7 +228,7 @@ const Tool: FC = ({
- {!isShowCanNotChooseMCPTip && !canNotSelectMultiple && (notShowProvider ? notShowProviderSelectInfo : selectedInfo)} + {!isShowCanNotChooseMCPTip && !canNotSelectMultiple && (notShowProvider ? notShowProviderSelectInfo : (!hideSelectedInfo && selectedInfo))} {isShowCanNotChooseMCPTip && } {hasAction && ( diff --git a/web/app/components/workflow/block-selector/tools.tsx b/web/app/components/workflow/block-selector/tools.tsx index 9247f5aea9..318326734a 100644 --- a/web/app/components/workflow/block-selector/tools.tsx +++ b/web/app/components/workflow/block-selector/tools.tsx @@ -21,6 +21,7 @@ type ToolsProps = { className?: string indexBarClassName?: string selectedTools?: ToolValue[] + hideSelectedInfo?: boolean } const Tools = ({ onSelect, @@ -34,6 +35,7 @@ const Tools = ({ className, indexBarClassName, selectedTools, + hideSelectedInfo, }: ToolsProps) => { // const tools: any = [] const language = useGetLanguage() @@ -107,6 +109,7 @@ const Tools = ({ canNotSelectMultiple={canNotSelectMultiple} onSelectMultiple={onSelectMultiple} selectedTools={selectedTools} + hideSelectedInfo={hideSelectedInfo} indexBar={} /> ) @@ -118,6 +121,7 @@ const Tools = ({ canNotSelectMultiple={canNotSelectMultiple} onSelectMultiple={onSelectMultiple} selectedTools={selectedTools} + hideSelectedInfo={hideSelectedInfo} /> ) )} diff --git a/web/app/components/workflow/skill/editor/skill-editor/plugins/tool-block/component.tsx b/web/app/components/workflow/skill/editor/skill-editor/plugins/tool-block/component.tsx index 68dd6dedf5..90b51a82c7 100644 --- a/web/app/components/workflow/skill/editor/skill-editor/plugins/tool-block/component.tsx +++ b/web/app/components/workflow/skill/editor/skill-editor/plugins/tool-block/component.tsx @@ -395,6 +395,10 @@ const ToolBlockComponent: FC = ({ setToolValue(prev => (prev ? { ...prev, credential_id: id } : prev)) } + const needAuthorization = useMemo(() => { + return !(!currentProvider || currentProvider.type !== CollectionType.builtIn || !currentProvider.allow_delete) + }, [currentProvider]) + const toolSettingsContent = currentProvider && currentTool && toolValue && ( <> = ({ description={toolDescriptionText} onClose={() => setIsSettingOpen(false)} /> - - + {needAuthorization && ( + <> + + + )} + {!needAuthorization && ( + + )} )