mirror of
https://github.com/Comfy-Org/ComfyUI_frontend.git
synced 2026-04-05 12:09:08 +00:00
Compare commits
1 Commits
fix/codera
...
fix/codera
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
af29f850ce |
@@ -9,21 +9,6 @@ interface UseCurveEditorOptions {
|
||||
modelValue: Ref<CurvePoint[]>
|
||||
}
|
||||
|
||||
function insertSorted(
|
||||
points: CurvePoint[],
|
||||
point: CurvePoint
|
||||
): [CurvePoint[], number] {
|
||||
let lo = 0
|
||||
let hi = points.length
|
||||
while (lo < hi) {
|
||||
const mid = (lo + hi) >>> 1
|
||||
if (points[mid][0] < point[0]) lo = mid + 1
|
||||
else hi = mid
|
||||
}
|
||||
const result = [...points.slice(0, lo), point, ...points.slice(lo)]
|
||||
return [result, lo]
|
||||
}
|
||||
|
||||
export function useCurveEditor({ svgRef, modelValue }: UseCurveEditorOptions) {
|
||||
const dragIndex = ref(-1)
|
||||
let cleanupDrag: (() => void) | null = null
|
||||
@@ -92,10 +77,11 @@ export function useCurveEditor({ svgRef, modelValue }: UseCurveEditorOptions) {
|
||||
if (e.ctrlKey) return
|
||||
|
||||
const newPoint: CurvePoint = [x, y]
|
||||
const [newPoints, insertIndex] = insertSorted(modelValue.value, newPoint)
|
||||
const newPoints: CurvePoint[] = [...modelValue.value, newPoint]
|
||||
newPoints.sort((a, b) => a[0] - b[0])
|
||||
modelValue.value = newPoints
|
||||
|
||||
startDrag(insertIndex, e)
|
||||
startDrag(newPoints.indexOf(newPoint), e)
|
||||
}
|
||||
|
||||
function startDrag(index: number, e: PointerEvent) {
|
||||
@@ -120,10 +106,11 @@ export function useCurveEditor({ svgRef, modelValue }: UseCurveEditorOptions) {
|
||||
if (dragIndex.value < 0) return
|
||||
const [x, y] = svgCoords(ev)
|
||||
const movedPoint: CurvePoint = [x, y]
|
||||
const remaining = modelValue.value.filter((_, i) => i !== dragIndex.value)
|
||||
const [newPoints, newIndex] = insertSorted(remaining, movedPoint)
|
||||
const newPoints = [...modelValue.value]
|
||||
newPoints[dragIndex.value] = movedPoint
|
||||
newPoints.sort((a, b) => a[0] - b[0])
|
||||
modelValue.value = newPoints
|
||||
dragIndex.value = newIndex
|
||||
dragIndex.value = newPoints.indexOf(movedPoint)
|
||||
}
|
||||
|
||||
const endDrag = () => {
|
||||
|
||||
@@ -178,7 +178,7 @@
|
||||
"uploadAlreadyInProgress": "Upload already in progress",
|
||||
"capture": "capture",
|
||||
"nodes": "Nodes",
|
||||
"nodesCount": "{count} node | {count} nodes",
|
||||
"nodesCount": "{count} nodes | {count} node | {count} nodes",
|
||||
"addNode": "Add a node...",
|
||||
"filterBy": "Filter by:",
|
||||
"filterByType": "Filter by {type}...",
|
||||
@@ -222,7 +222,7 @@
|
||||
"failed": "Failed",
|
||||
"cancelled": "Cancelled",
|
||||
"job": "Job",
|
||||
"asset": "{count} asset | {count} assets",
|
||||
"asset": "{count} assets | {count} asset | {count} assets",
|
||||
"untitled": "Untitled",
|
||||
"emDash": "—",
|
||||
"enabling": "Enabling {id}",
|
||||
@@ -3347,7 +3347,7 @@
|
||||
}
|
||||
},
|
||||
"errorOverlay": {
|
||||
"errorCount": "{count} ERROR | {count} ERRORS",
|
||||
"errorCount": "{count} ERRORS | {count} ERROR | {count} ERRORS",
|
||||
"seeErrors": "See Errors"
|
||||
},
|
||||
"help": {
|
||||
@@ -3357,7 +3357,7 @@
|
||||
"progressToast": {
|
||||
"importingModels": "Importing Models",
|
||||
"downloadingModel": "Downloading model...",
|
||||
"downloadsFailed": "{count} download failed | {count} downloads failed",
|
||||
"downloadsFailed": "{count} downloads failed | {count} download failed | {count} downloads failed",
|
||||
"allDownloadsCompleted": "All downloads completed",
|
||||
"noImportsInQueue": "No {filter} in queue",
|
||||
"failed": "Failed",
|
||||
@@ -3374,7 +3374,7 @@
|
||||
"exportingAssets": "Exporting Assets",
|
||||
"preparingExport": "Preparing export...",
|
||||
"exportError": "Export failed",
|
||||
"exportFailed": "{count} export failed | {count} exports failed",
|
||||
"exportFailed": "{count} export failed | {count} export failed | {count} exports failed",
|
||||
"allExportsCompleted": "All exports completed",
|
||||
"noExportsInQueue": "No {filter} exports in queue",
|
||||
"exportStarted": "Preparing ZIP download...",
|
||||
|
||||
@@ -1,59 +1,79 @@
|
||||
import { flushPromises, mount } from '@vue/test-utils'
|
||||
import { beforeEach, describe, expect, it, vi } from 'vitest'
|
||||
import { ref } from 'vue'
|
||||
|
||||
import ComfyHubPublishDialog from '@/platform/workflow/sharing/components/publish/ComfyHubPublishDialog.vue'
|
||||
import type { ComfyHubProfile } from '@/schemas/apiSchema'
|
||||
|
||||
const mockFetchProfile = vi.hoisted(() => vi.fn())
|
||||
const mockGoToStep = vi.hoisted(() => vi.fn())
|
||||
const mockGoNext = vi.hoisted(() => vi.fn())
|
||||
const mockGoBack = vi.hoisted(() => vi.fn())
|
||||
const mockOpenProfileCreationStep = vi.hoisted(() => vi.fn())
|
||||
const mockCloseProfileCreationStep = vi.hoisted(() => vi.fn())
|
||||
const mockFetchApi = vi.hoisted(() => vi.fn())
|
||||
const mockToastErrorHandler = vi.hoisted(() => vi.fn())
|
||||
const mockResolvedUserInfo = vi.hoisted(() => ({
|
||||
value: { id: 'user-a' }
|
||||
}))
|
||||
|
||||
vi.mock(
|
||||
'@/platform/workflow/sharing/composables/useComfyHubProfileGate',
|
||||
() => ({
|
||||
useComfyHubProfileGate: () => ({
|
||||
fetchProfile: mockFetchProfile
|
||||
})
|
||||
vi.mock('@/scripts/api', () => ({
|
||||
api: {
|
||||
fetchApi: mockFetchApi
|
||||
}
|
||||
}))
|
||||
|
||||
vi.mock('@/composables/auth/useCurrentUser', () => ({
|
||||
useCurrentUser: () => ({
|
||||
resolvedUserInfo: mockResolvedUserInfo
|
||||
})
|
||||
)
|
||||
}))
|
||||
|
||||
vi.mock(
|
||||
'@/platform/workflow/sharing/composables/useComfyHubPublishWizard',
|
||||
() => ({
|
||||
useComfyHubPublishWizard: () => ({
|
||||
currentStep: ref('finish'),
|
||||
formData: ref({
|
||||
name: '',
|
||||
description: '',
|
||||
workflowType: '',
|
||||
tags: [],
|
||||
thumbnailType: 'image',
|
||||
thumbnailFile: null,
|
||||
comparisonBeforeFile: null,
|
||||
comparisonAfterFile: null,
|
||||
exampleImages: [],
|
||||
selectedExampleIds: []
|
||||
}),
|
||||
isFirstStep: ref(false),
|
||||
isLastStep: ref(true),
|
||||
goToStep: mockGoToStep,
|
||||
goNext: mockGoNext,
|
||||
goBack: mockGoBack,
|
||||
openProfileCreationStep: mockOpenProfileCreationStep,
|
||||
closeProfileCreationStep: mockCloseProfileCreationStep
|
||||
})
|
||||
vi.mock('@/composables/useErrorHandling', () => ({
|
||||
useErrorHandling: () => ({
|
||||
toastErrorHandler: mockToastErrorHandler
|
||||
})
|
||||
)
|
||||
}))
|
||||
|
||||
vi.mock('@/platform/workflow/management/stores/workflowStore', () => ({
|
||||
useWorkflowStore: () => ({
|
||||
activeWorkflow: { filename: 'test-workflow' }
|
||||
})
|
||||
}))
|
||||
|
||||
const mockProfile: ComfyHubProfile = {
|
||||
username: 'testuser',
|
||||
name: 'Test User',
|
||||
description: 'A test profile'
|
||||
}
|
||||
|
||||
function mockSuccessResponse(data?: unknown) {
|
||||
return {
|
||||
ok: true,
|
||||
json: async () => data ?? mockProfile
|
||||
} as Response
|
||||
}
|
||||
|
||||
function mockErrorResponse(status = 404) {
|
||||
return {
|
||||
ok: false,
|
||||
status,
|
||||
json: async () => ({ message: 'Not found' })
|
||||
} as Response
|
||||
}
|
||||
|
||||
// Reset module-level singleton state in useComfyHubProfileGate between tests
|
||||
async function resetProfileGateSingleton() {
|
||||
const { useComfyHubProfileGate } =
|
||||
await import('@/platform/workflow/sharing/composables/useComfyHubProfileGate')
|
||||
const gate = useComfyHubProfileGate()
|
||||
gate.hasProfile.value = null
|
||||
gate.profile.value = null
|
||||
gate.isCheckingProfile.value = false
|
||||
gate.isFetchingProfile.value = false
|
||||
}
|
||||
|
||||
describe('ComfyHubPublishDialog', () => {
|
||||
const onClose = vi.fn()
|
||||
|
||||
beforeEach(() => {
|
||||
beforeEach(async () => {
|
||||
vi.clearAllMocks()
|
||||
mockFetchProfile.mockResolvedValue(null)
|
||||
mockResolvedUserInfo.value = { id: 'user-a' }
|
||||
mockFetchApi.mockResolvedValue(mockErrorResponse())
|
||||
await resetProfileGateSingleton()
|
||||
})
|
||||
|
||||
function createWrapper() {
|
||||
@@ -78,7 +98,7 @@ describe('ComfyHubPublishDialog', () => {
|
||||
},
|
||||
ComfyHubPublishWizardContent: {
|
||||
template:
|
||||
'<div><button data-testid="require-profile" @click="$props.onRequireProfile()" /><button data-testid="gate-complete" @click="$props.onGateComplete()" /><button data-testid="gate-close" @click="$props.onGateClose()" /></div>',
|
||||
'<div><button data-testid="require-profile" @click="$props.onRequireProfile()" /><button data-testid="gate-complete" @click="$props.onGateComplete()" /><button data-testid="gate-close" @click="$props.onGateClose()" /><span data-testid="current-step">{{ $props.currentStep }}</span></div>',
|
||||
props: [
|
||||
'currentStep',
|
||||
'formData',
|
||||
@@ -88,7 +108,9 @@ describe('ComfyHubPublishDialog', () => {
|
||||
'onGoBack',
|
||||
'onRequireProfile',
|
||||
'onGateComplete',
|
||||
'onGateClose'
|
||||
'onGateClose',
|
||||
'onUpdateFormData',
|
||||
'onPublish'
|
||||
]
|
||||
}
|
||||
}
|
||||
@@ -96,44 +118,62 @@ describe('ComfyHubPublishDialog', () => {
|
||||
})
|
||||
}
|
||||
|
||||
it('starts in publish wizard mode and prefetches profile asynchronously', async () => {
|
||||
it('prefetches profile on mount via real composable', async () => {
|
||||
createWrapper()
|
||||
await flushPromises()
|
||||
|
||||
expect(mockFetchProfile).toHaveBeenCalledWith()
|
||||
expect(mockFetchApi).toHaveBeenCalledWith('/hub/profile')
|
||||
})
|
||||
|
||||
it('switches to profile creation step when final-step publish requires profile', async () => {
|
||||
it('starts on the describe step with real wizard composable', async () => {
|
||||
const wrapper = createWrapper()
|
||||
await flushPromises()
|
||||
|
||||
expect(wrapper.find('[data-testid="current-step"]').text()).toBe('describe')
|
||||
})
|
||||
|
||||
it('switches to profileCreation step when require-profile is triggered', async () => {
|
||||
const wrapper = createWrapper()
|
||||
await flushPromises()
|
||||
|
||||
await wrapper.find('[data-testid="require-profile"]').trigger('click')
|
||||
|
||||
expect(mockOpenProfileCreationStep).toHaveBeenCalledOnce()
|
||||
expect(wrapper.find('[data-testid="current-step"]').text()).toBe(
|
||||
'profileCreation'
|
||||
)
|
||||
})
|
||||
|
||||
it('returns to finish state after gate complete and does not auto-close', async () => {
|
||||
it('returns to finish step and re-fetches profile after gate complete', async () => {
|
||||
mockFetchApi.mockResolvedValue(mockSuccessResponse())
|
||||
const wrapper = createWrapper()
|
||||
await flushPromises()
|
||||
|
||||
await wrapper.find('[data-testid="require-profile"]').trigger('click')
|
||||
expect(wrapper.find('[data-testid="current-step"]').text()).toBe(
|
||||
'profileCreation'
|
||||
)
|
||||
|
||||
await wrapper.find('[data-testid="gate-complete"]').trigger('click')
|
||||
await flushPromises()
|
||||
|
||||
expect(mockOpenProfileCreationStep).toHaveBeenCalledOnce()
|
||||
expect(mockCloseProfileCreationStep).toHaveBeenCalledOnce()
|
||||
expect(mockFetchProfile).toHaveBeenCalledWith({ force: true })
|
||||
expect(wrapper.find('[data-testid="current-step"]').text()).toBe('finish')
|
||||
// Initial prefetch + force re-fetch after gate complete
|
||||
expect(mockFetchApi).toHaveBeenCalledTimes(2)
|
||||
expect(onClose).not.toHaveBeenCalled()
|
||||
})
|
||||
|
||||
it('returns to finish state when profile gate is closed', async () => {
|
||||
it('returns to finish step when profile gate is closed', async () => {
|
||||
const wrapper = createWrapper()
|
||||
await flushPromises()
|
||||
|
||||
await wrapper.find('[data-testid="require-profile"]').trigger('click')
|
||||
expect(wrapper.find('[data-testid="current-step"]').text()).toBe(
|
||||
'profileCreation'
|
||||
)
|
||||
|
||||
await wrapper.find('[data-testid="gate-close"]').trigger('click')
|
||||
|
||||
expect(mockOpenProfileCreationStep).toHaveBeenCalledOnce()
|
||||
expect(mockCloseProfileCreationStep).toHaveBeenCalledOnce()
|
||||
expect(wrapper.find('[data-testid="current-step"]').text()).toBe('finish')
|
||||
expect(onClose).not.toHaveBeenCalled()
|
||||
})
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user