[lint] Enforce @typescript-eslint/no-floating-promises (#3402)

This commit is contained in:
Chenlei Hu
2025-04-11 12:19:22 -04:00
committed by GitHub
parent 59e20964a0
commit dc5d7ea1be
60 changed files with 305 additions and 279 deletions

View File

@@ -16,8 +16,8 @@ const userStore = useUserStore()
const tooltip = computed(
() => `${t('sideToolbar.logout')} (${userStore.currentUser?.username})`
)
const logout = () => {
userStore.logout()
const logout = async () => {
await userStore.logout()
window.location.reload()
}
</script>

View File

@@ -23,7 +23,7 @@ const icon = computed(() =>
)
const commandStore = useCommandStore()
const toggleTheme = () => {
commandStore.execute('Comfy.ToggleTheme')
const toggleTheme = async () => {
await commandStore.execute('Comfy.ToggleTheme')
}
</script>

View File

@@ -89,9 +89,8 @@ const handleSearch = async (query: string) => {
return model.searchable.includes(search)
})
nextTick(() => {
expandNode(root.value)
})
await nextTick()
expandNode(root.value)
}
type ModelOrFolder = ComfyModelDef | ModelFolder
@@ -177,7 +176,7 @@ watch(
const folderPath = key.split('/').slice(1).join('/')
if (folderPath && !folderPath.includes('/')) {
// Trigger (async) load of model data for this folder
modelStore.getLoadedModelFolder(folderPath)
void modelStore.getLoadedModelFolder(folderPath)
}
}
})

View File

@@ -153,7 +153,7 @@ const filteredRoot = computed<TreeNode | null>(() => {
const filters: Ref<
(SearchFilter & { filter: FuseFilterWithValue<ComfyNodeDefImpl, string> })[]
> = ref([])
const handleSearch = (query: string) => {
const handleSearch = async (query: string) => {
// Don't apply a min length filter because it does not make sense in
// multi-byte languages like Chinese, Japanese, Korean, etc.
if (query.length === 0 && !filters.value.length) {
@@ -174,13 +174,12 @@ const handleSearch = (query: string) => {
}
)
nextTick(() => {
// @ts-expect-error fixme ts strict error
expandNode(filteredRoot.value)
})
await nextTick()
// @ts-expect-error fixme ts strict error
expandNode(filteredRoot.value)
}
const onAddFilter = (
const onAddFilter = async (
filterAndValue: FuseFilterWithValue<ComfyNodeDefImpl, string>
) => {
filters.value.push({
@@ -191,15 +190,15 @@ const onAddFilter = (
id: +new Date()
})
handleSearch(searchQuery.value)
await handleSearch(searchQuery.value)
}
// @ts-expect-error fixme ts strict error
const onRemoveFilter = (filterAndValue) => {
const onRemoveFilter = async (filterAndValue) => {
const index = filters.value.findIndex((f) => f === filterAndValue)
if (index !== -1) {
filters.value.splice(index, 1)
}
handleSearch(searchQuery.value)
await handleSearch(searchQuery.value)
}
</script>

View File

@@ -157,11 +157,11 @@ const toggleExpanded = () => {
isExpanded.value = !isExpanded.value
}
const removeTask = (task: TaskItemImpl) => {
const removeTask = async (task: TaskItemImpl) => {
if (task.isRunning) {
api.interrupt()
await api.interrupt()
}
queueStore.delete(task)
await queueStore.delete(task)
}
const removeAllTasks = async () => {
@@ -251,8 +251,11 @@ const exitFolderView = () => {
folderTask.value = null
}
const toggleImageFit = () => {
settingStore.set(IMAGE_FIT, imageFit.value === 'cover' ? 'contain' : 'cover')
const toggleImageFit = async () => {
await settingStore.set(
IMAGE_FIT,
imageFit.value === 'cover' ? 'contain' : 'cover'
)
}
watch(allTasks, () => {

View File

@@ -160,7 +160,7 @@ const filteredWorkflows = ref<ComfyWorkflow[]>([])
const filteredRoot = computed<TreeNode>(() => {
return buildWorkflowTree(filteredWorkflows.value as ComfyWorkflow[])
})
const handleSearch = (query: string) => {
const handleSearch = async (query: string) => {
if (query.length === 0) {
filteredWorkflows.value = []
expandedKeys.value = {}
@@ -170,9 +170,8 @@ const handleSearch = (query: string) => {
filteredWorkflows.value = workflowStore.workflows.filter((workflow) => {
return workflow.path.toLocaleLowerCase().includes(lowerQuery)
})
nextTick(() => {
expandNode(filteredRoot.value)
})
await nextTick()
expandNode(filteredRoot.value)
}
const workflowStore = useWorkflowStore()
@@ -183,9 +182,9 @@ const expandedKeys = ref<Record<string, boolean>>({})
const { expandNode, toggleNodeOnEvent } = useTreeExpansion(expandedKeys)
const dummyExpandedKeys = ref<Record<string, boolean>>({})
const handleCloseWorkflow = (workflow?: ComfyWorkflow) => {
const handleCloseWorkflow = async (workflow?: ComfyWorkflow) => {
if (workflow) {
workflowService.closeWorkflow(workflow, {
await workflowService.closeWorkflow(workflow, {
warnIfUnsaved: !workspaceStore.shiftDown
})
}
@@ -225,9 +224,12 @@ const renderTreeNode = (
const workflow: ComfyWorkflow = node.data
function handleClick(this: TreeExplorerNode<ComfyWorkflow>, e: MouseEvent) {
async function handleClick(
this: TreeExplorerNode<ComfyWorkflow>,
e: MouseEvent
) {
if (this.leaf) {
workflowService.openWorkflow(workflow)
await workflowService.openWorkflow(workflow)
} else {
toggleNodeOnEvent(e, this)
}
@@ -254,9 +256,9 @@ const renderTreeNode = (
{
label: t('g.insert'),
icon: 'pi pi-file-export',
command: () => {
command: async () => {
const workflow = node.data
workflowService.insertWorkflow(workflow)
await workflowService.insertWorkflow(workflow)
}
}
]

View File

@@ -87,7 +87,7 @@ const handleModelHover = async () => {
modelPreviewStyle.value.left = `${targetRect.left - 400}px`
}
modelDef.value.load()
await modelDef.value.load()
}
const container = ref<HTMLElement | undefined>()
@@ -111,17 +111,17 @@ const showPreview = computed(() => {
const handleMouseEnter = async () => {
isHovered.value = true
await nextTick()
handleModelHover()
await handleModelHover()
}
const handleMouseLeave = () => {
isHovered.value = false
}
onMounted(() => {
onMounted(async () => {
modelContentElement.value =
container.value?.closest('.p-tree-node-content') ?? undefined
modelContentElement.value?.addEventListener('mouseenter', handleMouseEnter)
modelContentElement.value?.addEventListener('mouseleave', handleMouseLeave)
modelDef.value.load()
await modelDef.value.load()
})
onUnmounted(() => {

View File

@@ -82,9 +82,10 @@ const bookmarkedRoot = computed<TreeNode>(() => {
})
watch(
() => props.filteredNodeDefs,
(newValue) => {
async (newValue) => {
if (newValue.length) {
nextTick(() => expandNode(bookmarkedRoot.value))
await nextTick()
expandNode(bookmarkedRoot.value)
}
}
)
@@ -145,9 +146,9 @@ const renderedBookmarkedRoot = computed<TreeExplorerNode<ComfyNodeDefImpl>>(
},
children: sortedChildren,
draggable: node.leaf,
handleAddFolder(newName: string) {
async handleAddFolder(newName: string) {
if (newName !== '') {
nodeBookmarkStore.addNewBookmarkFolder(this.data, newName)
await nodeBookmarkStore.addNewBookmarkFolder(this.data, newName)
}
},
renderDragPreview(container) {
@@ -158,18 +159,18 @@ const renderedBookmarkedRoot = computed<TreeExplorerNode<ComfyNodeDefImpl>>(
}
},
droppable: !node.leaf,
handleDrop(data: TreeExplorerDragAndDropData<ComfyNodeDefImpl>) {
async handleDrop(data: TreeExplorerDragAndDropData<ComfyNodeDefImpl>) {
const nodeDefToAdd = data.data.data
// Remove bookmark if the source is the top level bookmarked node.
// @ts-expect-error fixme ts strict error
if (nodeBookmarkStore.isBookmarked(nodeDefToAdd)) {
// @ts-expect-error fixme ts strict error
nodeBookmarkStore.toggleBookmark(nodeDefToAdd)
await nodeBookmarkStore.toggleBookmark(nodeDefToAdd)
}
const folderNodeDef = node.data as ComfyNodeDefImpl
// @ts-expect-error fixme ts strict error
const nodePath = folderNodeDef.category + '/' + nodeDefToAdd.name
nodeBookmarkStore.addBookmark(nodePath)
await nodeBookmarkStore.addBookmark(nodePath)
},
handleClick(e: MouseEvent) {
if (this.leaf) {
@@ -183,14 +184,17 @@ const renderedBookmarkedRoot = computed<TreeExplorerNode<ComfyNodeDefImpl>>(
...(node.leaf
? {}
: {
handleRename(newName: string) {
async handleRename(newName: string) {
if (this.data && this.data.isDummyFolder) {
nodeBookmarkStore.renameBookmarkFolder(this.data, newName)
await nodeBookmarkStore.renameBookmarkFolder(
this.data,
newName
)
}
},
handleDelete() {
async handleDelete() {
// @ts-expect-error fixme ts strict error
nodeBookmarkStore.deleteBookmarkFolder(this.data)
await nodeBookmarkStore.deleteBookmarkFolder(this.data)
}
})
}
@@ -208,9 +212,9 @@ const showCustomizationDialog = ref(false)
const initialIcon = ref(nodeBookmarkStore.defaultBookmarkIcon)
const initialColor = ref(nodeBookmarkStore.defaultBookmarkColor)
const customizationTargetNodePath = ref('')
const updateCustomization = (icon: string, color: string) => {
const updateCustomization = async (icon: string, color: string) => {
if (customizationTargetNodePath.value) {
nodeBookmarkStore.updateBookmarkCustomization(
await nodeBookmarkStore.updateBookmarkCustomization(
customizationTargetNodePath.value,
{ icon, color }
)

View File

@@ -67,8 +67,8 @@ const sidebarLocation = computed<'left' | 'right'>(() =>
settingStore.get('Comfy.Sidebar.Location')
)
const toggleBookmark = () => {
nodeBookmarkStore.toggleBookmark(nodeDef.value)
const toggleBookmark = async () => {
await nodeBookmarkStore.toggleBookmark(nodeDef.value)
}
const previewRef = ref<InstanceType<typeof NodePreview> | null>(null)
@@ -104,7 +104,7 @@ const isHovered = ref(false)
const handleMouseEnter = async () => {
isHovered.value = true
await nextTick()
handleNodeHover()
await handleNodeHover()
}
const handleMouseLeave = () => {
isHovered.value = false