mirror of
https://github.com/langgenius/dify.git
synced 2026-04-22 07:46:31 +08:00
app selector trigger
This commit is contained in:
parent
73ce8a17a5
commit
c723bd2c96
@ -18,7 +18,7 @@ import { SimpleSelect } from '@/app/components/base/select'
|
|||||||
import Tooltip from '@/app/components/base/tooltip'
|
import Tooltip from '@/app/components/base/tooltip'
|
||||||
import Radio from '@/app/components/base/radio'
|
import Radio from '@/app/components/base/radio'
|
||||||
import ModelParameterModal from '@/app/components/header/account-setting/model-provider-page/model-parameter-modal'
|
import ModelParameterModal from '@/app/components/header/account-setting/model-provider-page/model-parameter-modal'
|
||||||
import ToolSelector from '@/app/components/tools/tool-selector'
|
import ToolSelector from '@/app/components/plugins/plugin-detail-panel/tool-selector'
|
||||||
|
|
||||||
type FormProps = {
|
type FormProps = {
|
||||||
className?: string
|
className?: string
|
||||||
|
|||||||
@ -0,0 +1,49 @@
|
|||||||
|
'use client'
|
||||||
|
import React from 'react'
|
||||||
|
import { useTranslation } from 'react-i18next'
|
||||||
|
import {
|
||||||
|
RiArrowDownSLine,
|
||||||
|
} from '@remixicon/react'
|
||||||
|
import AppIcon from '@/app/components/base/app-icon'
|
||||||
|
import type { App } from '@/types/app'
|
||||||
|
import cn from '@/utils/classnames'
|
||||||
|
|
||||||
|
type Props = {
|
||||||
|
open: boolean
|
||||||
|
appDetail?: App
|
||||||
|
}
|
||||||
|
|
||||||
|
const AppTrigger = ({
|
||||||
|
open,
|
||||||
|
appDetail,
|
||||||
|
}: Props) => {
|
||||||
|
const { t } = useTranslation()
|
||||||
|
return (
|
||||||
|
<div className={cn(
|
||||||
|
'group flex items-center p-2 pl-3 bg-components-input-bg-normal rounded-lg cursor-pointer hover:bg-state-base-hover-alt',
|
||||||
|
open && 'bg-state-base-hover-alt',
|
||||||
|
appDetail && 'pl-1.5 py-1.5',
|
||||||
|
)}>
|
||||||
|
{appDetail && (
|
||||||
|
<div className='shrink-0 mr-1 p-px rounded-lg bg-components-panel-bg border border-components-panel-border'>
|
||||||
|
<AppIcon
|
||||||
|
size='xs'
|
||||||
|
iconType={appDetail.icon_type}
|
||||||
|
icon={appDetail.icon}
|
||||||
|
background={appDetail.icon_background}
|
||||||
|
imageUrl={appDetail.icon_url}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
{appDetail && (
|
||||||
|
<div className='grow system-sm-regular text-components-input-text-filled'>{appDetail.name}</div>
|
||||||
|
)}
|
||||||
|
{!appDetail && (
|
||||||
|
<div className='grow text-components-input-text-placeholder system-sm-regular truncate'>{t('app.appSelector.placeholder')}</div>
|
||||||
|
)}
|
||||||
|
<RiArrowDownSLine className={cn('shrink-0 ml-0.5 w-4 h-4 text-text-quaternary group-hover:text-text-secondary', open && 'text-text-secondary')} />
|
||||||
|
</div>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
export default AppTrigger
|
||||||
@ -0,0 +1,129 @@
|
|||||||
|
'use client'
|
||||||
|
import type { FC } from 'react'
|
||||||
|
import React, { useMemo, useState } from 'react'
|
||||||
|
import { useTranslation } from 'react-i18next'
|
||||||
|
import {
|
||||||
|
PortalToFollowElem,
|
||||||
|
PortalToFollowElemContent,
|
||||||
|
PortalToFollowElemTrigger,
|
||||||
|
} from '@/app/components/base/portal-to-follow-elem'
|
||||||
|
import AppTrigger from '@/app/components/plugins/plugin-detail-panel/app-selector/app-trigger'
|
||||||
|
import ToolPicker from '@/app/components/workflow/block-selector/tool-picker'
|
||||||
|
import Button from '@/app/components/base/button'
|
||||||
|
|
||||||
|
import {
|
||||||
|
useAllBuiltInTools,
|
||||||
|
useAllCustomTools,
|
||||||
|
useAllWorkflowTools,
|
||||||
|
} from '@/service/use-tools'
|
||||||
|
import { CollectionType } from '@/app/components/tools/types'
|
||||||
|
import type { ToolDefaultValue } from '@/app/components/workflow/block-selector/types'
|
||||||
|
import type {
|
||||||
|
OffsetOptions,
|
||||||
|
Placement,
|
||||||
|
} from '@floating-ui/react'
|
||||||
|
import cn from '@/utils/classnames'
|
||||||
|
|
||||||
|
type Props = {
|
||||||
|
value?: {
|
||||||
|
provider: string
|
||||||
|
tool_name: string
|
||||||
|
}
|
||||||
|
disabled?: boolean
|
||||||
|
placement?: Placement
|
||||||
|
offset?: OffsetOptions
|
||||||
|
onSelect: (tool: {
|
||||||
|
provider: string
|
||||||
|
tool_name: string
|
||||||
|
}) => void
|
||||||
|
supportAddCustomTool?: boolean
|
||||||
|
}
|
||||||
|
const AppSelector: FC<Props> = ({
|
||||||
|
value,
|
||||||
|
disabled,
|
||||||
|
placement = 'bottom',
|
||||||
|
offset = 4,
|
||||||
|
onSelect,
|
||||||
|
}) => {
|
||||||
|
const { t } = useTranslation()
|
||||||
|
const [isShow, onShowChange] = useState(false)
|
||||||
|
const handleTriggerClick = () => {
|
||||||
|
if (disabled) return
|
||||||
|
onShowChange(true)
|
||||||
|
}
|
||||||
|
|
||||||
|
const { data: buildInTools } = useAllBuiltInTools()
|
||||||
|
const { data: customTools } = useAllCustomTools()
|
||||||
|
const { data: workflowTools } = useAllWorkflowTools()
|
||||||
|
const currentProvider = useMemo(() => {
|
||||||
|
const mergedTools = [...(buildInTools || []), ...(customTools || []), ...(workflowTools || [])]
|
||||||
|
return mergedTools.find((toolWithProvider) => {
|
||||||
|
return toolWithProvider.id === value?.provider && toolWithProvider.tools.some(tool => tool.name === value?.tool_name)
|
||||||
|
})
|
||||||
|
}, [value, buildInTools, customTools, workflowTools])
|
||||||
|
const [isShowChooseApp, setIsShowChooseApp] = useState(false)
|
||||||
|
const handleSelectTool = (tool: ToolDefaultValue) => {
|
||||||
|
const toolValue = {
|
||||||
|
provider: tool.provider_id,
|
||||||
|
tool_name: tool.tool_name,
|
||||||
|
}
|
||||||
|
onSelect(toolValue)
|
||||||
|
setIsShowChooseApp(false)
|
||||||
|
if (tool.provider_type === CollectionType.builtIn && tool.is_team_authorization)
|
||||||
|
onShowChange(false)
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<PortalToFollowElem
|
||||||
|
placement={placement}
|
||||||
|
offset={offset}
|
||||||
|
open={isShow}
|
||||||
|
onOpenChange={onShowChange}
|
||||||
|
>
|
||||||
|
<PortalToFollowElemTrigger
|
||||||
|
className='w-full'
|
||||||
|
onClick={handleTriggerClick}
|
||||||
|
>
|
||||||
|
<AppTrigger
|
||||||
|
open={isShow}
|
||||||
|
appDetail={undefined}
|
||||||
|
/>
|
||||||
|
</PortalToFollowElemTrigger>
|
||||||
|
<PortalToFollowElemContent className='z-[1000]'>
|
||||||
|
<div className="relative w-[389px] min-h-20 rounded-xl bg-components-panel-bg-blur border-[0.5px] border-components-panel-border shadow-lg">
|
||||||
|
<div className='px-4 py-3 flex flex-col gap-1'>
|
||||||
|
<div className='h-6 flex items-center system-sm-semibold text-text-secondary'>{t('tools.toolSelector.label')}</div>
|
||||||
|
<ToolPicker
|
||||||
|
placement='bottom'
|
||||||
|
offset={offset}
|
||||||
|
trigger={
|
||||||
|
<AppTrigger
|
||||||
|
open={isShowChooseApp}
|
||||||
|
appDetail={undefined}
|
||||||
|
/>
|
||||||
|
}
|
||||||
|
isShow={isShowChooseApp}
|
||||||
|
onShowChange={setIsShowChooseApp}
|
||||||
|
disabled={false}
|
||||||
|
supportAddCustomTool
|
||||||
|
onSelect={handleSelectTool}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
{/* app inputs config panel */}
|
||||||
|
<div className='px-4 py-3 flex items-center border-t border-divider-subtle'>
|
||||||
|
<Button
|
||||||
|
variant='primary'
|
||||||
|
className={cn('shrink-0 w-full')}
|
||||||
|
onClick={() => {}}
|
||||||
|
>
|
||||||
|
{t('tools.auth.unauthorized')}
|
||||||
|
</Button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</PortalToFollowElemContent>
|
||||||
|
</PortalToFollowElem>
|
||||||
|
</>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
export default React.memo(AppSelector)
|
||||||
@ -11,6 +11,8 @@ import Toast from '@/app/components/base/toast'
|
|||||||
import { useLanguage } from '@/app/components/header/account-setting/model-provider-page/hooks'
|
import { useLanguage } from '@/app/components/header/account-setting/model-provider-page/hooks'
|
||||||
import cn from '@/utils/classnames'
|
import cn from '@/utils/classnames'
|
||||||
|
|
||||||
|
import AppSelector from '@/app/components/plugins/plugin-detail-panel/app-selector'
|
||||||
|
|
||||||
type Props = {
|
type Props = {
|
||||||
formSchemas: any
|
formSchemas: any
|
||||||
defaultValues?: any
|
defaultValues?: any
|
||||||
@ -38,6 +40,8 @@ const EndpointModal: FC<Props> = ({
|
|||||||
onSaved(tempCredential)
|
onSaved(tempCredential)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const [mockApp, setMockApp] = React.useState<any>(null)
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Drawer
|
<Drawer
|
||||||
isOpen
|
isOpen
|
||||||
@ -81,6 +85,11 @@ const EndpointModal: FC<Props> = ({
|
|||||||
</a>)
|
</a>)
|
||||||
: null}
|
: null}
|
||||||
/>
|
/>
|
||||||
|
<AppSelector
|
||||||
|
disabled={false}
|
||||||
|
value={mockApp}
|
||||||
|
onSelect={setMockApp}
|
||||||
|
/>
|
||||||
</div>
|
</div>
|
||||||
<div className={cn('p-4 pt-0 flex justify-end')} >
|
<div className={cn('p-4 pt-0 flex justify-end')} >
|
||||||
<div className='flex gap-2'>
|
<div className='flex gap-2'>
|
||||||
|
|||||||
@ -7,11 +7,11 @@ import {
|
|||||||
PortalToFollowElemContent,
|
PortalToFollowElemContent,
|
||||||
PortalToFollowElemTrigger,
|
PortalToFollowElemTrigger,
|
||||||
} from '@/app/components/base/portal-to-follow-elem'
|
} from '@/app/components/base/portal-to-follow-elem'
|
||||||
import ToolTrigger from '@/app/components/tools/tool-selector/tool-trigger'
|
import ToolTrigger from '@/app/components/plugins/plugin-detail-panel/tool-selector/tool-trigger'
|
||||||
import ToolPicker from '@/app/components/workflow/block-selector/tool-picker'
|
import ToolPicker from '@/app/components/workflow/block-selector/tool-picker'
|
||||||
import Button from '@/app/components/base/button'
|
import Button from '@/app/components/base/button'
|
||||||
import Indicator from '@/app/components/header/indicator'
|
import Indicator from '@/app/components/header/indicator'
|
||||||
import ToolCredentialForm from '@/app/components/tools/tool-selector/tool-credentials-form'
|
import ToolCredentialForm from '@/app/components/plugins/plugin-detail-panel/tool-selector/tool-credentials-form'
|
||||||
import Toast from '@/app/components/base/toast'
|
import Toast from '@/app/components/base/toast'
|
||||||
|
|
||||||
import { useAppContext } from '@/context/app-context'
|
import { useAppContext } from '@/context/app-context'
|
||||||
@ -133,6 +133,11 @@ const translation = {
|
|||||||
removeConfirmContent: 'The current configuration is in use, removing it will turn off the Tracing feature.',
|
removeConfirmContent: 'The current configuration is in use, removing it will turn off the Tracing feature.',
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
appSelector: {
|
||||||
|
label: 'APP',
|
||||||
|
placeholder: 'Select an app...',
|
||||||
|
params: 'APP PARAMETERS',
|
||||||
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
export default translation
|
export default translation
|
||||||
|
|||||||
@ -132,6 +132,11 @@ const translation = {
|
|||||||
removeConfirmContent: '当前配置正在使用中,删除它将关闭追踪功能。',
|
removeConfirmContent: '当前配置正在使用中,删除它将关闭追踪功能。',
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
appSelector: {
|
||||||
|
label: '应用',
|
||||||
|
placeholder: '选择一个应用',
|
||||||
|
params: '应用参数',
|
||||||
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
export default translation
|
export default translation
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user