Merge remote-tracking branch 'origin/main' into refactor/plugins-components

2026-03-28 17:40:53 +08:00 · 2026-02-03 17:55:32 +08:00
parent b54dfde74a 476946f122
commit 49e5bab2a1
9 changed files with 75 additions and 59 deletions
--- a/web/app/components/app-initializer.tsx
+++ b/web/app/components/app-initializer.tsx
@ -3,7 +3,7 @@
 import type { ReactNode } from 'react'
 import Cookies from 'js-cookie'
 import { usePathname, useRouter, useSearchParams } from 'next/navigation'
-import { parseAsString, useQueryState } from 'nuqs'
+import { parseAsBoolean, useQueryState } from 'nuqs'
 import { useCallback, useEffect, useState } from 'react'
 import {
  EDUCATION_VERIFY_URL_SEARCHPARAMS_ACTION,
@ -28,7 +28,7 @@ export const AppInitializer = ({
  const [init, setInit] = useState(false)
  const [oauthNewUser, setOauthNewUser] = useQueryState(
    'oauth_new_user',
-    parseAsString.withOptions({ history: 'replace' }),
+    parseAsBoolean.withOptions({ history: 'replace' }),
  )

  const isSetupFinished = useCallback(async () => {
@ -46,7 +46,7 @@ export const AppInitializer = ({
    (async () => {
      const action = searchParams.get('action')

-      if (oauthNewUser === 'true') {
+      if (oauthNewUser) {
        let utmInfo = null
        const utmInfoStr = Cookies.get('utm_info')
        if (utmInfoStr) {
--- a/web/app/components/app/create-app-dialog/app-card/index.tsx
+++ b/web/app/components/app/create-app-dialog/app-card/index.tsx
@ -62,19 +62,19 @@ const AppCard = ({
          {app.description}
        </div>
      </div>
-      {canCreate && (
+      {(canCreate || isTrialApp) && (
        <div className={cn('absolute bottom-0 left-0 right-0 hidden bg-gradient-to-t from-components-panel-gradient-2 from-[60.27%] to-transparent p-4 pt-8 group-hover:flex')}>
-          <div className={cn('grid h-8 w-full grid-cols-1 items-center space-x-2', isTrialApp && 'grid-cols-2')}>
-            <Button variant="primary" onClick={() => onCreate()}>
-              <PlusIcon className="mr-1 h-4 w-4" />
-              <span className="text-xs">{t('newApp.useTemplate', { ns: 'app' })}</span>
-            </Button>
-            {isTrialApp && (
-              <Button onClick={showTryAPPPanel(app.app_id)}>
-                <RiInformation2Line className="mr-1 size-4" />
-                <span>{t('appCard.try', { ns: 'explore' })}</span>
+          <div className={cn('grid h-8 w-full grid-cols-1 items-center space-x-2', canCreate && 'grid-cols-2')}>
+            {canCreate && (
+              <Button variant="primary" onClick={() => onCreate()}>
+                <PlusIcon className="mr-1 h-4 w-4" />
+                <span className="text-xs">{t('newApp.useTemplate', { ns: 'app' })}</span>
              </Button>
            )}
+            <Button onClick={showTryAPPPanel(app.app_id)}>
+              <RiInformation2Line className="mr-1 size-4" />
+              <span>{t('appCard.try', { ns: 'explore' })}</span>
+            </Button>
          </div>
        </div>
      )}
--- a/web/app/components/explore/app-card/index.tsx
+++ b/web/app/components/explore/app-card/index.tsx
@ -74,11 +74,15 @@ const AppCard = ({
      </div>
      {isExplore && (canCreate || isTrialApp) && (
        <div className={cn('absolute bottom-0 left-0 right-0 hidden bg-gradient-to-t from-components-panel-gradient-2 from-[60.27%] to-transparent p-4 pt-8 group-hover:flex')}>
-          <div className={cn('grid h-8 w-full grid-cols-2 space-x-2')}>
-            <Button variant="primary" className="h-7" onClick={() => onCreate()}>
-              <PlusIcon className="mr-1 h-4 w-4" />
-              <span className="text-xs">{t('appCard.addToWorkspace', { ns: 'explore' })}</span>
-            </Button>
+          <div className={cn('grid h-8 w-full grid-cols-1 space-x-2', canCreate && 'grid-cols-2')}>
+            {
+              canCreate && (
+                <Button variant="primary" className="h-7" onClick={() => onCreate()}>
+                  <PlusIcon className="mr-1 h-4 w-4" />
+                  <span className="text-xs">{t('appCard.addToWorkspace', { ns: 'explore' })}</span>
+                </Button>
+              )
+            }
            <Button className="h-7" onClick={showTryAPPPanel(app.app_id)}>
              <RiInformation2Line className="mr-1 size-4" />
              <span>{t('appCard.try', { ns: 'explore' })}</span>
--- a/web/app/components/explore/try-app/index.spec.tsx
+++ b/web/app/components/explore/try-app/index.spec.tsx
@ -16,6 +16,14 @@ vi.mock('react-i18next', () => ({
  }),
 }))

+vi.mock('@/config', async (importOriginal) => {
+  const actual = await importOriginal() as object
+  return {
+    ...actual,
+    IS_CLOUD_EDITION: true,
+  }
+})
+
 const mockUseGetTryAppInfo = vi.fn()

 vi.mock('@/service/use-try-app', () => ({
--- a/web/app/components/explore/try-app/tab.spec.tsx
+++ b/web/app/components/explore/try-app/tab.spec.tsx
@ -14,6 +14,14 @@ vi.mock('react-i18next', () => ({
  }),
 }))

+vi.mock('@/config', async (importOriginal) => {
+  const actual = await importOriginal() as object
+  return {
+    ...actual,
+    IS_CLOUD_EDITION: true,
+  }
+})
+
 describe('Tab', () => {
  afterEach(() => {
    cleanup()
--- a/web/app/components/plugins/plugin-detail-panel/subscription-list/create/common-modal.spec.tsx
+++ b/web/app/components/plugins/plugin-detail-panel/subscription-list/create/common-modal.spec.tsx
@ -1,5 +1,5 @@
 import type { TriggerSubscriptionBuilder } from '@/app/components/workflow/block-selector/types'
-import { fireEvent, render, screen, waitFor } from '@testing-library/react'
+import { act, fireEvent, render, screen, waitFor } from '@testing-library/react'
 import * as React from 'react'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 // Import after mocks
@ -821,6 +821,9 @@ describe('CommonCreateModal', () => {
        expect(mockCreateBuilder).toHaveBeenCalled()
      })

+      // Flush pending state updates from createBuilder promise resolution
+      await act(async () => {})
+
      const input = screen.getByTestId('form-field-webhook_url')
      fireEvent.change(input, { target: { value: 'https://example.com/webhook' } })

--- a/web/app/components/rag-pipeline/components/update-dsl-modal.spec.tsx
+++ b/web/app/components/rag-pipeline/components/update-dsl-modal.spec.tsx
@ -140,13 +140,13 @@ class MockFileReader {
  onload: ((e: { target: { result: string | null } }) => void) | null = null

  readAsText(_file: File) {
-    // Simulate async file reading
-    setTimeout(() => {
+    // Simulate async file reading using queueMicrotask for more reliable async behavior
+    queueMicrotask(() => {
      this.result = 'test file content'
      if (this.onload) {
        this.onload({ target: { result: this.result } })
      }
-    }, 0)
+    })
  }
 }

@ -174,6 +174,7 @@ describe('UpdateDSLModal', () => {
      status: DSLImportStatus.COMPLETED,
      pipeline_id: 'test-pipeline-id',
    })
+    mockHandleCheckPluginDependencies.mockResolvedValue(undefined)

    // Mock FileReader
    originalFileReader = globalThis.FileReader
@ -472,14 +473,14 @@ describe('UpdateDSLModal', () => {
      await waitFor(() => {
        const importButton = screen.getByText('common.overwriteAndImport')
        expect(importButton).not.toBeDisabled()
-      })
+      }, { timeout: 1000 })

      const importButton = screen.getByText('common.overwriteAndImport')
      fireEvent.click(importButton)

      await waitFor(() => {
        expect(mockOnImport).toHaveBeenCalled()
-      })
+      }, { timeout: 1000 })
    })

    it('should show warning notification on import with warnings', async () => {
@ -664,7 +665,7 @@ describe('UpdateDSLModal', () => {
      await waitFor(() => {
        const importButton = screen.getByText('common.overwriteAndImport')
        expect(importButton).not.toBeDisabled()
-      })
+      }, { timeout: 1000 })

      const importButton = screen.getByText('common.overwriteAndImport')
      fireEvent.click(importButton)
@ -672,7 +673,7 @@ describe('UpdateDSLModal', () => {
      // Wait for the error modal to be shown after setTimeout
      await waitFor(() => {
        expect(screen.getByText('newApp.appCreateDSLErrorTitle')).toBeInTheDocument()
-      }, { timeout: 500 })
+      }, { timeout: 1000 })
    })

    it('should show version info in error modal', async () => {
--- a/web/app/components/rag-pipeline/hooks/use-DSL.spec.ts
+++ b/web/app/components/rag-pipeline/hooks/use-DSL.spec.ts
@ -61,6 +61,12 @@ vi.mock('@/service/use-pipeline', () => ({
  }),
 }))

+// Mock download utility
+const mockDownloadBlob = vi.fn()
+vi.mock('@/utils/download', () => ({
+  downloadBlob: (...args: unknown[]) => mockDownloadBlob(...args),
+}))
+
 // Mock workflow service
 const mockFetchWorkflowDraft = vi.fn()
 vi.mock('@/service/workflow', () => ({
@ -77,33 +83,9 @@ vi.mock('@/app/components/workflow/constants', () => ({
 // ============================================================================

 describe('useDSL', () => {
-  let mockLink: { href: string, download: string, click: ReturnType<typeof vi.fn> }
-  let originalCreateElement: typeof document.createElement
-  let mockCreateObjectURL: ReturnType<typeof vi.spyOn>
-  let mockRevokeObjectURL: ReturnType<typeof vi.spyOn>
-
  beforeEach(() => {
    vi.clearAllMocks()

-    // Create a proper mock link element
-    mockLink = {
-      href: '',
-      download: '',
-      click: vi.fn(),
-    }
-
-    // Save original and mock selectively - only intercept 'a' elements
-    originalCreateElement = document.createElement.bind(document)
-    document.createElement = vi.fn((tagName: string) => {
-      if (tagName === 'a') {
-        return mockLink as unknown as HTMLElement
-      }
-      return originalCreateElement(tagName)
-    }) as typeof document.createElement
-
-    mockCreateObjectURL = vi.spyOn(URL, 'createObjectURL').mockReturnValue('blob:test-url')
-    mockRevokeObjectURL = vi.spyOn(URL, 'revokeObjectURL').mockImplementation(() => {})
-
    // Default store state
    mockWorkflowStoreGetState.mockReturnValue({
      pipelineId: 'test-pipeline-id',
@ -118,9 +100,6 @@ describe('useDSL', () => {
  })

  afterEach(() => {
-    document.createElement = originalCreateElement
-    mockCreateObjectURL.mockRestore()
-    mockRevokeObjectURL.mockRestore()
    vi.clearAllMocks()
  })

@ -187,9 +166,7 @@ describe('useDSL', () => {
        await result.current.handleExportDSL()
      })

-      expect(document.createElement).toHaveBeenCalledWith('a')
-      expect(mockCreateObjectURL).toHaveBeenCalled()
-      expect(mockRevokeObjectURL).toHaveBeenCalledWith('blob:test-url')
+      expect(mockDownloadBlob).toHaveBeenCalled()
    })

    it('should use correct file extension for download', async () => {
@ -199,17 +176,25 @@ describe('useDSL', () => {
        await result.current.handleExportDSL()
      })

-      expect(mockLink.download).toBe('Test Knowledge Base.pipeline')
+      expect(mockDownloadBlob).toHaveBeenCalledWith(
+        expect.objectContaining({
+          fileName: 'Test Knowledge Base.pipeline',
+        }),
+      )
    })

-    it('should trigger download click', async () => {
+    it('should pass blob data to downloadBlob', async () => {
      const { result } = renderHook(() => useDSL())

      await act(async () => {
        await result.current.handleExportDSL()
      })

-      expect(mockLink.click).toHaveBeenCalled()
+      expect(mockDownloadBlob).toHaveBeenCalledWith(
+        expect.objectContaining({
+          data: expect.any(Blob),
+        }),
+      )
    })

    it('should show error notification on export failure', async () => {
--- a/web/app/components/tools/edit-custom-collection-modal/index.spec.tsx
+++ b/web/app/components/tools/edit-custom-collection-modal/index.spec.tsx
@ -172,6 +172,9 @@ describe('EditCustomCollectionModal', () => {
        expect(parseParamsSchemaMock).toHaveBeenCalledWith('{}')
      })

+      // Flush pending state updates from parseParamsSchema promise resolution
+      await act(async () => {})
+
      await act(async () => {
        fireEvent.click(screen.getByText('common.operation.save'))
      })
@ -184,6 +187,10 @@ describe('EditCustomCollectionModal', () => {
          credentials: {
            auth_type: 'none',
          },
+          icon: {
+            content: '🕵️',
+            background: '#FEF7C3',
+          },
          labels: [],
        }))
        expect(toastNotifySpy).not.toHaveBeenCalled()