Revert "fix: display plugin trigger labels in logs using i18n metadata"

This reverts commit 651cc81cfe.

api/controllers/console/app/workflow_trigger.py

@@ -1,5 +1,4 @@
 import logging
-from typing import Any
 
 from flask_restx import Resource, marshal_with, reqparse
 from sqlalchemy import select
@@ -100,12 +99,12 @@ class AppTriggersApi(Resource):
                 plugin_trigger_map = {plugin_trigger.node_id: plugin_trigger for plugin_trigger in plugin_triggers}
 
         tenant_id = current_user.current_tenant_id if isinstance(current_user, Account) else None
-        provider_cache: dict[str, dict[str, Any]] = {}
+        provider_cache: dict[str, dict[str, str]] = {}
 
-        def resolve_provider_metadata(provider_id: str) -> dict[str, Any]:
+        def resolve_provider_metadata(provider_id: str) -> dict[str, str]:
             if provider_id in provider_cache:
                 return provider_cache[provider_id]
-            metadata: dict[str, Any] = {}
+            metadata: dict[str, str] = {}
             if not tenant_id:
                 provider_cache[provider_id] = metadata
                 return metadata
@@ -117,7 +116,6 @@ class AppTriggersApi(Resource):
                     "plugin_unique_identifier": controller.plugin_unique_identifier,
                     "icon": api_entity.icon or "",
                     "provider_name": api_entity.name,
-                    "provider_label": api_entity.label,
                 }
             except Exception:
                 metadata = {}
@@ -139,7 +137,6 @@ class AppTriggersApi(Resource):
                 trigger.icon = metadata.get("icon", "")  # type: ignore[attr-defined]
                 if not trigger.provider_name:
                     trigger.provider_name = metadata.get("provider_name", "")
-                trigger.provider_label = metadata.get("provider_label")  # type: ignore[attr-defined]
             else:
                 trigger.icon = ""  # type: ignore[attr-defined]
 
@@ -204,7 +201,6 @@ class AppTriggerEnableApi(Resource):
                     trigger.event_name = plugin_trigger.event_name  # type: ignore[attr-defined]
                     trigger.plugin_id = controller.plugin_id  # type: ignore[attr-defined]
                     trigger.plugin_unique_identifier = controller.plugin_unique_identifier  # type: ignore[attr-defined]
-                    trigger.provider_label = controller.to_api_entity().label  # type: ignore[attr-defined]
                     plugin_icon = controller.to_api_entity().icon or ""
                 except Exception:
                     plugin_icon = ""

api/fields/workflow_trigger_fields.py

@@ -6,7 +6,6 @@ trigger_fields = {
     "title": fields.String,
     "node_id": fields.String,
     "provider_name": fields.String,
-    "provider_label": fields.Raw,
     "provider_id": fields.String,
     "subscription_id": fields.String,
     "event_name": fields.String,

api/services/workflow_app_service.py

@@ -1,7 +1,6 @@
 import json
 import uuid
 from datetime import datetime
-from typing import Any
 
 from sqlalchemy import and_, func, or_, select
 from sqlalchemy.orm import Session
@@ -183,18 +182,17 @@ class WorkflowAppService:
             )
             plugin_trigger_map = {plugin.node_id: plugin for plugin in plugin_triggers}
 
-        provider_cache: dict[str, dict[str, Any]] = {}
+        provider_cache: dict[str, dict[str, str]] = {}
 
-        def resolve_provider(provider_id: str) -> dict[str, Any]:
+        def resolve_provider(provider_id: str) -> dict[str, str]:
             if provider_id in provider_cache:
                 return provider_cache[provider_id]
-            metadata: dict[str, Any] = {}
+            metadata: dict[str, str] = {}
             try:
                 controller = TriggerManager.get_trigger_provider(app_model.tenant_id, TriggerProviderID(provider_id))
                 api_entity = controller.to_api_entity()
                 metadata = {
                     "provider_name": api_entity.name,
-                    "provider_label": api_entity.label,
                     "icon": api_entity.icon or "",
                     "plugin_id": controller.plugin_id,
                     "plugin_unique_identifier": controller.plugin_unique_identifier,

web/app/components/app/workflow-log/trigger-by-display.tsx

@@ -93,26 +93,16 @@ const getTriggerIcon = (triggeredFrom: string, triggerInfo?: TriggerInfo) => {
   }
 }
 
-const pickLabel = (labelMap?: Record<string, string>, language?: string) => {
-  if (!labelMap)
-    return ''
-  if (language && labelMap[language])
-    return labelMap[language]
-  return labelMap.en_US || labelMap['en-US'] || Object.values(labelMap)[0] || ''
-}
-
 const TriggerByDisplay: FC<TriggerByDisplayProps> = ({
   triggeredFrom,
   className = '',
   showText = true,
   triggerInfo,
 }) => {
-  const { t, i18n } = useTranslation()
+  const { t } = useTranslation()
 
   const resolvedType = resolveTriggerType(triggerInfo?.type || triggeredFrom)
-  const providerDisplayName = pickLabel(triggerInfo?.provider_label, i18n.language)
-    || triggerInfo?.provider_name
-  const displayName = providerDisplayName || getTriggerDisplayName(resolvedType, t)
+  const displayName = triggerInfo?.provider_name || getTriggerDisplayName(resolvedType, t)
   const icon = getTriggerIcon(resolvedType, triggerInfo)
 
   return (

web/models/log.ts

@@ -249,7 +249,6 @@ export type TriggerInfo = {
   workflow_trigger_log_id?: string
   provider_id?: string
   provider_name?: string
-  provider_label?: Record<string, string>
   subscription_id?: string
   event_name?: string
   plugin_id?: string

web/service/use-tools.ts

@@ -335,7 +335,6 @@ export type AppTrigger = {
   title: string
   node_id: string
   provider_name: string
-  provider_label?: Record<string, string>
   provider_id?: string
   subscription_id?: string
   plugin_id?: string