Fix type error (#27274)

2025-10-22 17:08:27 +08:00
parent 40d3332690
commit c61c2b0abd
16 changed files with 55 additions and 54 deletions
--- a/web/app/components/app/annotation/index.tsx
+++ b/web/app/components/app/annotation/index.tsx
@@ -53,7 +53,6 @@ const Annotation: FC<Props> = (props) => {
  const [isShowViewModal, setIsShowViewModal] = useState(false)
  const [selectedIds, setSelectedIds] = useState<string[]>([])
  const debouncedQueryParams = useDebounce(queryParams, { wait: 500 })
-  const [isBatchDeleting, setIsBatchDeleting] = useState(false)

  const fetchAnnotationConfig = async () => {
    const res = await doFetchAnnotationConfig(appDetail.id)
@@ -108,9 +107,6 @@ const Annotation: FC<Props> = (props) => {
  }

  const handleBatchDelete = async () => {
-    if (isBatchDeleting)
-      return
-    setIsBatchDeleting(true)
    try {
      await delAnnotations(appDetail.id, selectedIds)
      Toast.notify({ message: t('common.api.actionSuccess'), type: 'success' })
@@ -121,9 +117,6 @@ const Annotation: FC<Props> = (props) => {
    catch (e: any) {
      Toast.notify({ type: 'error', message: e.message || t('common.api.actionFailed') })
    }
-    finally {
-      setIsBatchDeleting(false)
-    }
  }

  const handleView = (item: AnnotationItem) => {
@@ -213,7 +206,6 @@ const Annotation: FC<Props> = (props) => {
              onSelectedIdsChange={setSelectedIds}
              onBatchDelete={handleBatchDelete}
              onCancel={() => setSelectedIds([])}
-              isBatchDeleting={isBatchDeleting}
            />
            : <div className='flex h-full grow items-center justify-center'><EmptyElement /></div>
        }
--- a/web/app/components/app/annotation/list.tsx
+++ b/web/app/components/app/annotation/list.tsx
@@ -19,7 +19,6 @@ type Props = {
  onSelectedIdsChange: (selectedIds: string[]) => void
  onBatchDelete: () => Promise<void>
  onCancel: () => void
-  isBatchDeleting?: boolean
 }

 const List: FC<Props> = ({
@@ -30,7 +29,6 @@ const List: FC<Props> = ({
  onSelectedIdsChange,
  onBatchDelete,
  onCancel,
-  isBatchDeleting,
 }) => {
  const { t } = useTranslation()
  const { formatTime } = useTimestamp()
@@ -142,7 +140,6 @@ const List: FC<Props> = ({
          selectedIds={selectedIds}
          onBatchDelete={onBatchDelete}
          onCancel={onCancel}
-          isBatchDeleting={isBatchDeleting}
        />
      )}
    </div>
--- a/web/app/components/app/configuration/config-prompt/advanced-prompt-input.tsx
+++ b/web/app/components/app/configuration/config-prompt/advanced-prompt-input.tsx
@@ -78,7 +78,9 @@ const AdvancedPromptInput: FC<Props> = ({
  const handleOpenExternalDataToolModal = () => {
    setShowExternalDataToolModal({
      payload: {},
-      onSaveCallback: (newExternalDataTool: ExternalDataTool) => {
+      onSaveCallback: (newExternalDataTool?: ExternalDataTool) => {
+        if (!newExternalDataTool)
+          return
        eventEmitter?.emit({
          type: ADD_EXTERNAL_DATA_TOOL,
          payload: newExternalDataTool,
--- a/web/app/components/app/configuration/config-prompt/simple-prompt-input.tsx
+++ b/web/app/components/app/configuration/config-prompt/simple-prompt-input.tsx
@@ -76,7 +76,9 @@ const Prompt: FC<ISimplePromptInput> = ({
  const handleOpenExternalDataToolModal = () => {
    setShowExternalDataToolModal({
      payload: {},
-      onSaveCallback: (newExternalDataTool: ExternalDataTool) => {
+      onSaveCallback: (newExternalDataTool?: ExternalDataTool) => {
+        if (!newExternalDataTool)
+          return
        eventEmitter?.emit({
          type: ADD_EXTERNAL_DATA_TOOL,
          payload: newExternalDataTool,
--- a/web/app/components/app/configuration/config-var/config-modal/index.tsx
+++ b/web/app/components/app/configuration/config-var/config-modal/index.tsx
@@ -320,7 +320,7 @@ const ConfigModal: FC<IConfigModalProps> = ({
          {type === InputVarType.paragraph && (
            <Field title={t('appDebug.variableConfig.defaultValue')}>
              <Textarea
-                value={tempPayload.default || ''}
+                value={String(tempPayload.default ?? '')}
                onChange={e => handlePayloadChange('default')(e.target.value || undefined)}
                placeholder={t('appDebug.variableConfig.inputPlaceholder')!}
              />
--- a/web/app/components/app/configuration/config-var/index.tsx
+++ b/web/app/components/app/configuration/config-var/index.tsx
@@ -121,7 +121,9 @@ const ConfigVar: FC<IConfigVarProps> = ({ promptVariables, readonly, onPromptVar
        icon,
        icon_background,
      },
-      onSaveCallback: (newExternalDataTool: ExternalDataTool) => {
+      onSaveCallback: (newExternalDataTool?: ExternalDataTool) => {
+        if (!newExternalDataTool)
+          return
        const newPromptVariables = oldPromptVariables.map((item, i) => {
          if (i === index) {
            return {
--- a/web/app/components/app/configuration/config/agent/prompt-editor.tsx
+++ b/web/app/components/app/configuration/config/agent/prompt-editor.tsx
@@ -51,7 +51,9 @@ const Editor: FC<Props> = ({
  const handleOpenExternalDataToolModal = () => {
    setShowExternalDataToolModal({
      payload: {},
-      onSaveCallback: (newExternalDataTool: ExternalDataTool) => {
+      onSaveCallback: (newExternalDataTool?: ExternalDataTool) => {
+        if (!newExternalDataTool)
+          return
        setExternalDataToolsConfig([...externalDataToolsConfig, newExternalDataTool])
      },
      onValidateBeforeSaveCallback: (newExternalDataTool: ExternalDataTool) => {
--- a/web/app/components/app/configuration/debug/index.tsx
+++ b/web/app/components/app/configuration/debug/index.tsx
@@ -109,7 +109,7 @@ const Debug: FC<IDebug> = ({
      setIsShowFormattingChangeConfirm(true)
  }, [formattingChanged])

-  const debugWithSingleModelRef = React.useRef<DebugWithSingleModelRefType | null>(null)
+  const debugWithSingleModelRef = React.useRef<DebugWithSingleModelRefType>(null!)
  const handleClearConversation = () => {
    debugWithSingleModelRef.current?.handleRestart()
  }
--- a/web/app/components/app/configuration/tools/index.tsx
+++ b/web/app/components/app/configuration/tools/index.tsx
@@ -76,7 +76,11 @@ const Tools = () => {
  const handleOpenExternalDataToolModal = (payload: ExternalDataTool, index: number) => {
    setShowExternalDataToolModal({
      payload,
-      onSaveCallback: (externalDataTool: ExternalDataTool) => handleSaveExternalDataToolModal(externalDataTool, index),
+      onSaveCallback: (externalDataTool?: ExternalDataTool) => {
+        if (!externalDataTool)
+          return
+        handleSaveExternalDataToolModal(externalDataTool, index)
+      },
      onValidateBeforeSaveCallback: (newExternalDataTool: ExternalDataTool) => handleValidateBeforeSaveExternalDataToolModal(newExternalDataTool, index),
    })
  }
--- a/web/app/components/app/create-from-dsl-modal/index.tsx
+++ b/web/app/components/app/create-from-dsl-modal/index.tsx
@@ -84,7 +84,7 @@ const CreateFromDSLModal = ({ show, onSuccess, onClose, activeTab = CreateFromDS
      handleFile(droppedFile)
  }, [droppedFile])

-  const onCreate: MouseEventHandler = async () => {
+  const onCreate = async (_e?: React.MouseEvent) => {
    if (currentTab === CreateFromDSLModalTab.FROM_FILE && !currentFile)
      return
    if (currentTab === CreateFromDSLModalTab.FROM_URL && !dslUrlValue)
@@ -154,7 +154,7 @@ const CreateFromDSLModal = ({ show, onSuccess, onClose, activeTab = CreateFromDS

  useKeyPress(['meta.enter', 'ctrl.enter'], () => {
    if (show && !isAppsFull && ((currentTab === CreateFromDSLModalTab.FROM_FILE && currentFile) || (currentTab === CreateFromDSLModalTab.FROM_URL && dslUrlValue)))
-      handleCreateApp()
+      handleCreateApp(undefined)
  })

  useKeyPress('esc', () => {
--- a/web/app/components/base/confirm/index.tsx
+++ b/web/app/components/base/confirm/index.tsx
@@ -6,7 +6,7 @@ import Button from '../button'
 export type IConfirm = {
  className?: string
  isShow: boolean
-  type?: 'info' | 'warning'
+  type?: 'info' | 'warning' | 'danger'
  title: string
  content?: React.ReactNode
  confirmText?: string | null
--- a/web/app/components/tools/labels/constant.ts
+++ b/web/app/components/tools/labels/constant.ts
@@ -2,6 +2,6 @@ import type { TypeWithI18N } from '@/app/components/header/account-setting/model

 export type Label = {
  name: string
-  label: TypeWithI18N
-  icon: string
+  label: TypeWithI18N | string
+  icon?: string
 }
--- a/web/app/components/tools/types.ts
+++ b/web/app/components/tools/types.ts
@@ -7,6 +7,7 @@ export enum LOC {

 export enum AuthType {
  none = 'none',
+  apiKey = 'api_key', // backward compatibility
  apiKeyHeader = 'api_key_header',
  apiKeyQuery = 'api_key_query',
 }