Properly show empty folder in model sidebar tab (#1242)

* Properly show empty folder in model sidebar tab

* nit

* nit
This commit is contained in:
Chenlei Hu
2024-10-12 17:02:58 -04:00
committed by GitHub
parent a890756868
commit c1c990e6f3
3 changed files with 18 additions and 29 deletions

View File

@@ -68,7 +68,8 @@ const root: ComputedRef<TreeNode> = computed(() => {
if (Object.values(models.models).length) {
modelList.push(...Object.values(models.models))
} else {
const fakeModel = new ComfyModelDef('(No Content)', folder)
// ModelDef with key 'folder/a/b/c/' is treated as empty folder
const fakeModel = new ComfyModelDef('', folder)
fakeModel.is_fake_object = true
modelList.push(fakeModel)
}
@@ -84,12 +85,9 @@ const root: ComputedRef<TreeNode> = computed(() => {
return model.searchable.includes(search)
})
}
const tree: TreeNode = buildTree(modelList, (model: ComfyModelDef) => {
return [
model.directory,
...model.file_name.replaceAll('\\', '/').split('/')
]
})
const tree: TreeNode = buildTree(modelList, (model: ComfyModelDef) =>
model.key.split('/')
)
return tree
})
@@ -100,18 +98,7 @@ const renderedRoot = computed<TreeExplorerNode<ComfyModelDef>>(() => {
const model: ComfyModelDef | null =
node.leaf && node.data ? node.data : null
if (model?.is_fake_object) {
if (model.file_name === '(No Content)') {
return {
key: node.key,
label: t('noContent'),
leaf: true,
data: node.data,
getIcon: (node: TreeExplorerNode<ComfyModelDef>) => {
return 'pi pi-file'
},
children: []
}
} else {
if (model.file_name === 'Loading') {
return {
key: node.key,
label: t('loading') + '...',
@@ -149,9 +136,7 @@ const renderedRoot = computed<TreeExplorerNode<ComfyModelDef>>(() => {
if (node.children?.length === 1) {
const onlyChild = node.children[0]
if (onlyChild.data?.is_fake_object) {
if (onlyChild.data.file_name === '(No Content)') {
return '0'
} else if (onlyChild.data.file_name === 'Loading') {
if (onlyChild.data.file_name === 'Loading') {
return ''
}
}