opensource/dify
2
0
Fork 0
mirror of https://github.com/langgenius/dify.git synced 2026-04-29 04:26:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(trigger): check subscription removed

Browse Source
This commit is contained in:
yessenia 2025-10-21 20:01:05 +08:00
parent c90df5c12c
commit 9a3ca0ce3b
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
web/app/components/plugins/plugin-detail-panel/subscription-list/selector-entry.tsx
View File

@ -17,11 +17,15 @@ type SubscriptionTriggerButtonProps = {
onClick?: () => void onClick?: () => void
isOpen?: boolean isOpen?: boolean
className?: string className?: string
onSelect: (v: SimpleSubscription, callback?: () => void) => void
} }
export const INVALID_SUBSCRIPTION_ID = 'INVALID_SUBSCRIPTION_ID'
const SubscriptionTriggerButton: React.FC<SubscriptionTriggerButtonProps> = ({ const SubscriptionTriggerButton: React.FC<SubscriptionTriggerButtonProps> = ({
selectedId, selectedId,
onClick, onClick,
onSelect,
isOpen = false, isOpen = false,
className, className,
}) => { }) => {
@ -45,6 +49,7 @@ const SubscriptionTriggerButton: React.FC<SubscriptionTriggerButtonProps> = ({
const selectedSubscription = subscriptions?.find(sub => sub.id === selectedId) const selectedSubscription = subscriptions?.find(sub => sub.id === selectedId)
if (!selectedSubscription) { if (!selectedSubscription) {
onSelect({ id: INVALID_SUBSCRIPTION_ID, name: '' } as SimpleSubscription)
return { return {
label: t('pluginTrigger.subscription.subscriptionRemoved'), label: t('pluginTrigger.subscription.subscriptionRemoved'),
color: 'red' as const, color: 'red' as const,
@ -100,6 +105,7 @@ export const SubscriptionSelectorEntry = ({ selectedId, onSelect }: {
selectedId={selectedId} selectedId={selectedId}
onClick={() => setIsOpen(!isOpen)} onClick={() => setIsOpen(!isOpen)}
isOpen={isOpen} isOpen={isOpen}
onSelect={onSelect}
/> />
</div> </div>
</PortalToFollowElemTrigger> </PortalToFollowElemTrigger>

15
web/app/components/workflow/nodes/trigger-plugin/default.ts
View File

@ -1,11 +1,12 @@
import { BlockEnum, VarType } from '../../types' import { INVALID_SUBSCRIPTION_ID } from '@/app/components/plugins/plugin-detail-panel/subscription-list/selector-entry'
import type { NodeDefault, Var } from '../../types'
import { genNodeMetaData } from '../../utils'
import type { PluginTriggerNodeType } from './types'
import { getMatchedSchemaType } from '../_base/components/variable/use-match-schema-type'
import type { SchemaTypeDefinition } from '@/service/use-common' import type { SchemaTypeDefinition } from '@/service/use-common'
import { type Field, type StructuredOutput, Type } from '../llm/types' import type { NodeDefault, Var } from '../../types'
import { BlockEnum, VarType } from '../../types'
import { genNodeMetaData } from '../../utils'
import { getMatchedSchemaType } from '../_base/components/variable/use-match-schema-type'
import { VarKindType } from '../_base/types' import { VarKindType } from '../_base/types'
import { type Field, type StructuredOutput, Type } from '../llm/types'
import type { PluginTriggerNodeType } from './types'
const normalizeJsonSchemaType = (schema: any): string | undefined => { const normalizeJsonSchemaType = (schema: any): string | undefined => {
if (!schema) return undefined if (!schema) return undefined
@ -233,7 +234,7 @@ const nodeDefault: NodeDefault<PluginTriggerNodeType> = {
} = {}) { } = {}) {
let errorMessage = '' let errorMessage = ''
if (!payload.subscription_id) if (!payload.subscription_id || payload.subscription_id === INVALID_SUBSCRIPTION_ID)
errorMessage = t('workflow.nodes.triggerPlugin.subscriptionRequired') errorMessage = t('workflow.nodes.triggerPlugin.subscriptionRequired')
const { const {