From de2a4fe3a5182d5b9db0b7b5be4e2fce32d02f65 Mon Sep 17 00:00:00 2001
From: Stephen Zhou <38493346+hyoban@users.noreply.github.com>
Date: Mon, 29 Dec 2025 11:31:58 +0800
Subject: [PATCH] type check

---
 .../billing/upgrade-btn/index.spec.tsx           | 12 ++++++------
 web/app/components/billing/upgrade-btn/index.tsx |  2 +-
 web/app/components/datasets/create/index.tsx     |  7 ++++---
 .../datasets/create/step-three/index.spec.tsx    |  3 ++-
 .../datasets/create/step-two/index.tsx           |  6 +++---
 .../detail/completed/common/batch-action.tsx     |  2 +-
 web/app/components/datasets/documents/list.tsx   |  4 ++--
 .../components/plugins/marketplace/context.tsx   |  3 ++-
 web/app/components/plugins/utils.ts              |  7 +++++--
 .../workflow/block-selector/blocks.tsx           |  1 +
 web/config/index.ts                              |  1 +
 web/i18n/en-US/dataset.json                      |  1 +
 web/types/i18n.d.ts                              | 16 +++++++++++-----
 13 files changed, 40 insertions(+), 25 deletions(-)

diff --git a/web/app/components/billing/upgrade-btn/index.spec.tsx b/web/app/components/billing/upgrade-btn/index.spec.tsx
index 92756bfea2..a9db6c946f 100644
--- a/web/app/components/billing/upgrade-btn/index.spec.tsx
+++ b/web/app/components/billing/upgrade-btn/index.spec.tsx
@@ -66,7 +66,7 @@ describe('UpgradeBtn', () => {
 
     it('should render custom label when labelKey is provided', () => {
       // Act
-      render(<UpgradeBtn labelKey="custom.label.key" />)
+      render(<UpgradeBtn labelKey={'custom.label.key' as any} />)
 
       // Assert
       expect(screen.getByText(/custom\.label\.key/i)).toBeInTheDocument()
@@ -74,7 +74,7 @@ describe('UpgradeBtn', () => {
 
     it('should render custom label in plain button when labelKey is provided with isPlain', () => {
       // Act
-      render(<UpgradeBtn isPlain labelKey="custom.label.key" />)
+      render(<UpgradeBtn isPlain labelKey={'custom.label.key' as any} />)
 
       // Assert
       const button = screen.getByRole('button')
@@ -372,7 +372,7 @@ describe('UpgradeBtn', () => {
 
     it('should handle empty string labelKey', () => {
       // Act
-      render(<UpgradeBtn labelKey="" />)
+      render(<UpgradeBtn labelKey={'' as any} />)
 
       // Assert - empty labelKey is falsy, so it falls back to default label
       expect(screen.getByText(/billing\.upgradeBtn\.encourage/i)).toBeInTheDocument()
@@ -391,7 +391,7 @@ describe('UpgradeBtn', () => {
 
     it('should handle isPlain with custom labelKey', () => {
       // Act
-      render(<UpgradeBtn isPlain labelKey="custom.key" />)
+      render(<UpgradeBtn isPlain labelKey={'custom.key' as any} />)
 
       // Assert - labelKey should override plain text
       expect(screen.getByText(/custom\.key/i)).toBeInTheDocument()
@@ -400,7 +400,7 @@ describe('UpgradeBtn', () => {
 
     it('should handle isShort with custom labelKey', () => {
       // Act
-      render(<UpgradeBtn isShort labelKey="custom.short.key" />)
+      render(<UpgradeBtn isShort labelKey={'custom.short.key' as any} />)
 
       // Assert - labelKey should override isShort behavior
       expect(screen.getByText(/custom\.short\.key/i)).toBeInTheDocument()
@@ -423,7 +423,7 @@ describe('UpgradeBtn', () => {
           isShort
           onClick={handleClick}
           loc="test-loc"
-          labelKey="custom.all"
+          labelKey={'custom.all' as any}
         />,
       )
       const badge = screen.getByText(/custom\.all/i)
diff --git a/web/app/components/billing/upgrade-btn/index.tsx b/web/app/components/billing/upgrade-btn/index.tsx
index 79c9ba52a1..737ec03fc8 100644
--- a/web/app/components/billing/upgrade-btn/index.tsx
+++ b/web/app/components/billing/upgrade-btn/index.tsx
@@ -17,7 +17,7 @@ type Props = {
   isShort?: boolean
   onClick?: () => void
   loc?: string
-  labelKey?: I18nKeysWithPrefix<'billing', 'upgradeBtn.'>
+  labelKey?: Exclude<I18nKeysWithPrefix<'billing'>, 'plans.community.features' | 'plans.enterprise.features' | 'plans.premium.features'>
 }
 
 const UpgradeBtn: FC<Props> = ({
diff --git a/web/app/components/datasets/create/index.tsx b/web/app/components/datasets/create/index.tsx
index 498113e775..a028bc0775 100644
--- a/web/app/components/datasets/create/index.tsx
+++ b/web/app/components/datasets/create/index.tsx
@@ -1,6 +1,7 @@
 'use client'
 import type { NotionPage } from '@/models/common'
 import type { CrawlOptions, CrawlResultItem, createDocumentResponse, FileItem } from '@/models/datasets'
+import type { RETRIEVE_METHOD } from '@/types/app'
 import { produce } from 'immer'
 import * as React from 'react'
 import { useCallback, useState } from 'react'
@@ -43,7 +44,7 @@ const DatasetUpdateForm = ({ datasetId }: DatasetUpdateFormProps) => {
   const [dataSourceType, setDataSourceType] = useState<DataSourceType>(DataSourceType.FILE)
   const [step, setStep] = useState(1)
   const [indexingTypeCache, setIndexTypeCache] = useState('')
-  const [retrievalMethodCache, setRetrievalMethodCache] = useState('')
+  const [retrievalMethodCache, setRetrievalMethodCache] = useState<RETRIEVE_METHOD | ''>('')
   const [fileList, setFiles] = useState<FileItem[]>([])
   const [result, setResult] = useState<createDocumentResponse | undefined>()
   const [notionPages, setNotionPages] = useState<NotionPage[]>([])
@@ -90,7 +91,7 @@ const DatasetUpdateForm = ({ datasetId }: DatasetUpdateFormProps) => {
     setResult(res)
   }, [])
 
-  const updateRetrievalMethodCache = useCallback((method: string) => {
+  const updateRetrievalMethodCache = useCallback((method: RETRIEVE_METHOD | '') => {
     setRetrievalMethodCache(method)
   }, [])
 
@@ -166,7 +167,7 @@ const DatasetUpdateForm = ({ datasetId }: DatasetUpdateFormProps) => {
                   datasetId={datasetId}
                   datasetName={datasetDetail?.name}
                   indexingType={datasetDetail?.indexing_technique || indexingTypeCache}
-                  retrievalMethod={datasetDetail?.retrieval_model_dict?.search_method || retrievalMethodCache}
+                  retrievalMethod={datasetDetail?.retrieval_model_dict?.search_method || retrievalMethodCache || undefined}
                   creationCache={result}
                 />
               )}
diff --git a/web/app/components/datasets/create/step-three/index.spec.tsx b/web/app/components/datasets/create/step-three/index.spec.tsx
index 65d20b92d5..66abec755f 100644
--- a/web/app/components/datasets/create/step-three/index.spec.tsx
+++ b/web/app/components/datasets/create/step-three/index.spec.tsx
@@ -1,5 +1,6 @@
 import type { createDocumentResponse, FullDocumentDetail, IconInfo } from '@/models/datasets'
 import { render, screen } from '@testing-library/react'
+import { RETRIEVE_METHOD } from '@/types/app'
 import StepThree from './index'
 
 // Mock the EmbeddingProcess component since it has complex async logic
@@ -321,7 +322,7 @@ describe('StepThree', () => {
     describe('retrievalMethod prop', () => {
       it('should pass retrievalMethod to EmbeddingProcess', () => {
         // Arrange & Act
-        renderStepThree({ retrievalMethod: 'semantic_search' })
+        renderStepThree({ retrievalMethod: RETRIEVE_METHOD.semantic })
 
         // Assert
         expect(screen.getByTestId('ep-retrieval-method')).toHaveTextContent('semantic_search')
diff --git a/web/app/components/datasets/create/step-two/index.tsx b/web/app/components/datasets/create/step-two/index.tsx
index 3c97afd947..7f3b4b3589 100644
--- a/web/app/components/datasets/create/step-two/index.tsx
+++ b/web/app/components/datasets/create/step-two/index.tsx
@@ -88,7 +88,7 @@ type StepTwoProps = {
   websiteCrawlJobId?: string
   onStepChange?: (delta: number) => void
   updateIndexingTypeCache?: (type: string) => void
-  updateRetrievalMethodCache?: (method: string) => void
+  updateRetrievalMethodCache?: (method: RETRIEVE_METHOD | '') => void
   updateResultCache?: (res: createDocumentResponse) => void
   onSave?: () => void
   onCancel?: () => void
@@ -552,7 +552,7 @@ const StepTwo = ({
           onSuccess(data) {
             updateIndexingTypeCache?.(indexType as string)
             updateResultCache?.(data)
-            updateRetrievalMethodCache?.(retrievalConfig.search_method as string)
+            updateRetrievalMethodCache?.(retrievalConfig.search_method as RETRIEVE_METHOD)
           },
         },
       )
@@ -562,7 +562,7 @@ const StepTwo = ({
         onSuccess(data) {
           updateIndexingTypeCache?.(indexType as string)
           updateResultCache?.(data)
-          updateRetrievalMethodCache?.(retrievalConfig.search_method as string)
+          updateRetrievalMethodCache?.(retrievalConfig.search_method as RETRIEVE_METHOD)
         },
       })
     }
diff --git a/web/app/components/datasets/documents/detail/completed/common/batch-action.tsx b/web/app/components/datasets/documents/detail/completed/common/batch-action.tsx
index 1cf9ccae13..db36ca471a 100644
--- a/web/app/components/datasets/documents/detail/completed/common/batch-action.tsx
+++ b/web/app/components/datasets/documents/detail/completed/common/batch-action.tsx
@@ -100,7 +100,7 @@ const BatchAction: FC<IBatchActionProps> = ({
             onClick={onBatchReIndex}
           >
             <RiRefreshLine className="size-4" />
-            <span className="px-0.5">{t(`${i18nPrefix}.reIndex`)}</span>
+            <span className="px-0.5">{t(`${i18nPrefix}.reIndex`, { ns: 'dataset' })}</span>
           </Button>
         )}
         <Button
diff --git a/web/app/components/datasets/documents/list.tsx b/web/app/components/datasets/documents/list.tsx
index 7f905e97ec..0e039bba1a 100644
--- a/web/app/components/datasets/documents/list.tsx
+++ b/web/app/components/datasets/documents/list.tsx
@@ -255,11 +255,11 @@ const DocumentList: FC<IDocumentListProps> = ({
     const [e] = await asyncRunSafe<CommonResponse>(retryIndexDocument({ datasetId, documentIds: selectedIds }))
     if (!e) {
       onSelectedIdChange([])
-      Toast.notify({ type: 'success', message: t('common.actionMsg.modifiedSuccessfully') })
+      Toast.notify({ type: 'success', message: t('actionMsg.modifiedSuccessfully', { ns: 'common' }) })
       onUpdate()
     }
     else {
-      Toast.notify({ type: 'error', message: t('common.actionMsg.modifiedUnsuccessfully') })
+      Toast.notify({ type: 'error', message: t('actionMsg.modifiedUnsuccessfully', { ns: 'common' }) })
     }
   }
 
diff --git a/web/app/components/plugins/marketplace/context.tsx b/web/app/components/plugins/marketplace/context.tsx
index 4053c4a556..41f9a4def4 100644
--- a/web/app/components/plugins/marketplace/context.tsx
+++ b/web/app/components/plugins/marketplace/context.tsx
@@ -3,6 +3,7 @@
 import type {
   ReactNode,
 } from 'react'
+import type { TagKey } from '../constants'
 import type { Plugin } from '../types'
 import type {
   MarketplaceCollection,
@@ -113,7 +114,7 @@ export const MarketplaceContextProvider = ({
       return data?.plugins.map(plugin => plugin.plugin_id)
   }, [data?.plugins, shouldExclude])
   const queryFromSearchParams = searchParams?.q || ''
-  const tagsFromSearchParams = searchParams?.tags ? getValidTagKeys(searchParams.tags.split(',')) : []
+  const tagsFromSearchParams = searchParams?.tags ? getValidTagKeys(searchParams.tags.split(',') as TagKey[]) : []
   const hasValidTags = !!tagsFromSearchParams.length
   const hasValidCategory = getValidCategoryKeys(searchParams?.category)
   const categoryFromSearchParams = hasValidCategory || PLUGIN_TYPE_SEARCH_MAP.all
diff --git a/web/app/components/plugins/utils.ts b/web/app/components/plugins/utils.ts
index 9ad2332667..5d663b2134 100644
--- a/web/app/components/plugins/utils.ts
+++ b/web/app/components/plugins/utils.ts
@@ -1,11 +1,14 @@
-import { LanguagesSupported } from '@/i18n-config/language'
+import type {
+  TagKey,
+} from './constants'
 
+import { LanguagesSupported } from '@/i18n-config/language'
 import {
   categoryKeys,
   tagKeys,
 } from './constants'
 
-export const getValidTagKeys = (tags: string[]) => {
+export const getValidTagKeys = (tags: TagKey[]) => {
   return tags.filter(tag => tagKeys.includes(tag))
 }
 
diff --git a/web/app/components/workflow/block-selector/blocks.tsx b/web/app/components/workflow/block-selector/blocks.tsx
index 96977500ee..2425112335 100644
--- a/web/app/components/workflow/block-selector/blocks.tsx
+++ b/web/app/components/workflow/block-selector/blocks.tsx
@@ -39,6 +39,7 @@ const Blocks = ({
       type: block.type,
       title: block.title,
       author: 'Dify',
+      // @ts-expect-error Fix this missing field later
       description: block.description,
     },
     defaultValue: {},
diff --git a/web/config/index.ts b/web/config/index.ts
index b475087d07..b804629048 100644
--- a/web/config/index.ts
+++ b/web/config/index.ts
@@ -131,6 +131,7 @@ export const TONE_LIST = [
   {
     id: 4,
     name: 'Custom',
+    config: undefined,
   },
 ] as const
 
diff --git a/web/i18n/en-US/dataset.json b/web/i18n/en-US/dataset.json
index 7ba658fbbd..36553cd578 100644
--- a/web/i18n/en-US/dataset.json
+++ b/web/i18n/en-US/dataset.json
@@ -89,6 +89,7 @@
   "indexingMethod.full_text_search": "FULL TEXT",
   "indexingMethod.hybrid_search": "HYBRID",
   "indexingMethod.invertedIndex": "INVERTED",
+  "indexingMethod.keyword_search": "KEYWORD",
   "indexingMethod.semantic_search": "VECTOR",
   "indexingTechnique.economy": "ECO",
   "indexingTechnique.high_quality": "HQ",
diff --git a/web/types/i18n.d.ts b/web/types/i18n.d.ts
index 038c694eb9..160d385730 100644
--- a/web/types/i18n.d.ts
+++ b/web/types/i18n.d.ts
@@ -13,13 +13,19 @@ declare module 'i18next' {
 export type I18nKeysByPrefix<
   NS extends NamespaceCamelCase,
   Prefix extends string = '',
-> = keyof Resources[NS] extends infer K
-  ? K extends `${Prefix}${infer Rest}`
-    ? Rest
+> = Prefix extends ''
+  ? keyof Resources[NS]
+  : keyof Resources[NS] extends infer K
+    ? K extends `${Prefix}${infer Rest}`
+      ? Rest
+      : never
     : never
-  : never
 
 export type I18nKeysWithPrefix<
   NS extends NamespaceCamelCase,
   Prefix extends string = '',
-> = Extract<keyof Resources[NS], `${Prefix}${string}`>
+> = Prefix extends ''
+  ? keyof Resources[NS]
+  : Extract<keyof Resources[NS], `${Prefix}${string}`>
+
+type A = I18nKeysWithPrefix<'billing'>