fix: diplay all helpfields (#23348)
Signed-off-by: jingfelix <jingfelix@outlook.com>
This commit is contained in:
@@ -3,6 +3,7 @@ import {
|
|||||||
memo,
|
memo,
|
||||||
useMemo,
|
useMemo,
|
||||||
} from 'react'
|
} from 'react'
|
||||||
|
import { RiExternalLinkLine } from '@remixicon/react'
|
||||||
import type { AnyFieldApi } from '@tanstack/react-form'
|
import type { AnyFieldApi } from '@tanstack/react-form'
|
||||||
import { useStore } from '@tanstack/react-form'
|
import { useStore } from '@tanstack/react-form'
|
||||||
import cn from '@/utils/classnames'
|
import cn from '@/utils/classnames'
|
||||||
@@ -200,6 +201,22 @@ const BaseField = ({
|
|||||||
</div>
|
</div>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
{
|
||||||
|
formSchema.url && (
|
||||||
|
<a
|
||||||
|
className='system-xs-regular mt-4 flex items-center text-text-accent'
|
||||||
|
href={formSchema?.url}
|
||||||
|
target='_blank'
|
||||||
|
>
|
||||||
|
<span className='break-all'>
|
||||||
|
{renderI18nObject(formSchema?.help as any)}
|
||||||
|
</span>
|
||||||
|
{
|
||||||
|
<RiExternalLinkLine className='ml-1 h-3 w-3' />
|
||||||
|
}
|
||||||
|
</a>
|
||||||
|
)
|
||||||
|
}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
)
|
)
|
||||||
|
@@ -6,7 +6,6 @@ import {
|
|||||||
useState,
|
useState,
|
||||||
} from 'react'
|
} from 'react'
|
||||||
import { useTranslation } from 'react-i18next'
|
import { useTranslation } from 'react-i18next'
|
||||||
import { RiExternalLinkLine } from '@remixicon/react'
|
|
||||||
import { Lock01 } from '@/app/components/base/icons/src/vender/solid/security'
|
import { Lock01 } from '@/app/components/base/icons/src/vender/solid/security'
|
||||||
import Modal from '@/app/components/base/modal/modal'
|
import Modal from '@/app/components/base/modal/modal'
|
||||||
import { CredentialTypeEnum } from '../types'
|
import { CredentialTypeEnum } from '../types'
|
||||||
@@ -21,7 +20,6 @@ import {
|
|||||||
useGetPluginCredentialSchemaHook,
|
useGetPluginCredentialSchemaHook,
|
||||||
useUpdatePluginCredentialHook,
|
useUpdatePluginCredentialHook,
|
||||||
} from '../hooks/use-credential'
|
} from '../hooks/use-credential'
|
||||||
import { useRenderI18nObject } from '@/hooks/use-i18n'
|
|
||||||
|
|
||||||
export type ApiKeyModalProps = {
|
export type ApiKeyModalProps = {
|
||||||
pluginPayload: PluginPayload
|
pluginPayload: PluginPayload
|
||||||
@@ -64,8 +62,6 @@ const ApiKeyModal = ({
|
|||||||
acc[schema.name] = schema.default
|
acc[schema.name] = schema.default
|
||||||
return acc
|
return acc
|
||||||
}, {} as Record<string, any>)
|
}, {} as Record<string, any>)
|
||||||
const helpField = formSchemas.find(schema => schema.url && schema.help)
|
|
||||||
const renderI18nObject = useRenderI18nObject()
|
|
||||||
const { mutateAsync: addPluginCredential } = useAddPluginCredentialHook(pluginPayload)
|
const { mutateAsync: addPluginCredential } = useAddPluginCredentialHook(pluginPayload)
|
||||||
const { mutateAsync: updatePluginCredential } = useUpdatePluginCredentialHook(pluginPayload)
|
const { mutateAsync: updatePluginCredential } = useUpdatePluginCredentialHook(pluginPayload)
|
||||||
const formRef = useRef<FormRefObject>(null)
|
const formRef = useRef<FormRefObject>(null)
|
||||||
@@ -125,18 +121,7 @@ const ApiKeyModal = ({
|
|||||||
onClose={onClose}
|
onClose={onClose}
|
||||||
onCancel={onClose}
|
onCancel={onClose}
|
||||||
footerSlot={
|
footerSlot={
|
||||||
helpField && (
|
(<div></div>)
|
||||||
<a
|
|
||||||
className='system-xs-regular mr-2 flex items-center py-2 text-text-accent'
|
|
||||||
href={helpField?.url}
|
|
||||||
target='_blank'
|
|
||||||
>
|
|
||||||
<span className='break-all'>
|
|
||||||
{renderI18nObject(helpField?.help as any)}
|
|
||||||
</span>
|
|
||||||
<RiExternalLinkLine className='ml-1 h-3 w-3' />
|
|
||||||
</a>
|
|
||||||
)
|
|
||||||
}
|
}
|
||||||
bottomSlot={
|
bottomSlot={
|
||||||
<div className='flex items-center justify-center bg-background-section-burn py-3 text-xs text-text-tertiary'>
|
<div className='flex items-center justify-center bg-background-section-burn py-3 text-xs text-text-tertiary'>
|
||||||
|
@@ -4,7 +4,6 @@ import {
|
|||||||
useRef,
|
useRef,
|
||||||
useState,
|
useState,
|
||||||
} from 'react'
|
} from 'react'
|
||||||
import { RiExternalLinkLine } from '@remixicon/react'
|
|
||||||
import {
|
import {
|
||||||
useForm,
|
useForm,
|
||||||
useStore,
|
useStore,
|
||||||
@@ -24,7 +23,6 @@ import type {
|
|||||||
} from '@/app/components/base/form/types'
|
} from '@/app/components/base/form/types'
|
||||||
import { useToastContext } from '@/app/components/base/toast'
|
import { useToastContext } from '@/app/components/base/toast'
|
||||||
import Button from '@/app/components/base/button'
|
import Button from '@/app/components/base/button'
|
||||||
import { useRenderI18nObject } from '@/hooks/use-i18n'
|
|
||||||
|
|
||||||
type OAuthClientSettingsProps = {
|
type OAuthClientSettingsProps = {
|
||||||
pluginPayload: PluginPayload
|
pluginPayload: PluginPayload
|
||||||
@@ -129,8 +127,6 @@ const OAuthClientSettings = ({
|
|||||||
defaultValues: editValues || defaultValues,
|
defaultValues: editValues || defaultValues,
|
||||||
})
|
})
|
||||||
const __oauth_client__ = useStore(form.store, s => s.values.__oauth_client__)
|
const __oauth_client__ = useStore(form.store, s => s.values.__oauth_client__)
|
||||||
const helpField = schemas.find(schema => schema.url && schema.help)
|
|
||||||
const renderI18nObject = useRenderI18nObject()
|
|
||||||
return (
|
return (
|
||||||
<Modal
|
<Modal
|
||||||
title={t('plugin.auth.oauthClientSettings')}
|
title={t('plugin.auth.oauthClientSettings')}
|
||||||
@@ -167,19 +163,6 @@ const OAuthClientSettings = ({
|
|||||||
defaultValues={editValues || defaultValues}
|
defaultValues={editValues || defaultValues}
|
||||||
disabled={disabled}
|
disabled={disabled}
|
||||||
/>
|
/>
|
||||||
{
|
|
||||||
helpField && __oauth_client__ === 'custom' && (
|
|
||||||
<a
|
|
||||||
className='system-xs-regular mt-4 flex items-center text-text-accent'
|
|
||||||
href={helpField?.url}
|
|
||||||
target='_blank'
|
|
||||||
>
|
|
||||||
<span className='break-all'>
|
|
||||||
{renderI18nObject(helpField?.help as any)}
|
|
||||||
</span>
|
|
||||||
<RiExternalLinkLine className='ml-1 h-3 w-3' />
|
|
||||||
</a>
|
|
||||||
)}
|
|
||||||
</>
|
</>
|
||||||
</Modal>
|
</Modal>
|
||||||
)
|
)
|
||||||
|
Reference in New Issue
Block a user