From b8ca480b072968258799b759daa25739a937d25b Mon Sep 17 00:00:00 2001 From: Harry Date: Thu, 9 Oct 2025 12:23:48 +0800 Subject: [PATCH] refactor(trigger): update variable names for clarity and consistency - Renamed variables related to triggers to use 'trigger' terminology consistently across the codebase. - Adjusted filtering logic in `TriggerPluginList` to reference 'events' instead of 'triggers' for improved clarity. - Updated the `getTriggerIcon` function to reflect the new naming conventions and ensure proper icon rendering. --- .../components/app/overview/trigger-card.tsx | 17 +++++++++-------- .../block-selector/trigger-plugin/list.tsx | 6 +++--- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/web/app/components/app/overview/trigger-card.tsx b/web/app/components/app/overview/trigger-card.tsx index ccc74160b1..856f17c595 100644 --- a/web/app/components/app/overview/trigger-card.tsx +++ b/web/app/components/app/overview/trigger-card.tsx @@ -57,15 +57,16 @@ const getTriggerIcon = (trigger: AppTrigger, triggerPlugins: any[]) => { blockType = BlockEnum.TriggerWebhook } - let toolIcon: string | undefined + let triggerIcon: string | undefined if (trigger_type === 'trigger-plugin' && provider_name) { - const targetTools = triggerPlugins || [] - const foundTool = targetTools.find(toolWithProvider => - canFindTool(toolWithProvider.id, provider_name) - || toolWithProvider.id.includes(provider_name) - || toolWithProvider.name === provider_name, + const targetTriggers = triggerPlugins || [] + const foundTrigger = targetTriggers.find(triggerWithProvider => + canFindTool(triggerWithProvider.id, provider_name) + || triggerWithProvider.id.includes(provider_name) + || triggerWithProvider.name === provider_name, ) - toolIcon = foundTool?.icon + triggerIcon = foundTrigger?.icon + console.log('triggerIcon', triggerIcon) } return ( @@ -73,7 +74,7 @@ const getTriggerIcon = (trigger: AppTrigger, triggerPlugins: any[]) => { {getStatusDot()} diff --git a/web/app/components/workflow/block-selector/trigger-plugin/list.tsx b/web/app/components/workflow/block-selector/trigger-plugin/list.tsx index e7d3ad54a7..38f546e884 100644 --- a/web/app/components/workflow/block-selector/trigger-plugin/list.tsx +++ b/web/app/components/workflow/block-selector/trigger-plugin/list.tsx @@ -24,13 +24,13 @@ const TriggerPluginList = ({ const triggerPlugins = useMemo(() => { // Follow exact same pattern as tools return (triggerPluginsData || []).filter((triggerWithProvider) => { - if (triggerWithProvider.triggers.length === 0) return false + if (triggerWithProvider.events.length === 0) return false // Filter by search text if (searchText) { const matchesSearch = triggerWithProvider.name.toLowerCase().includes(searchText.toLowerCase()) - || triggerWithProvider.triggers.some(tool => - tool.label[language].toLowerCase().includes(searchText.toLowerCase()), + || triggerWithProvider.events.some(event => + event.label[language].toLowerCase().includes(searchText.toLowerCase()), ) if (!matchesSearch) return false }