fix: remove unrelated merge artifacts

apps/desktop-ui/src/components/maintenance/TaskCard.vue

@@ -62,10 +62,10 @@ import Button from 'primevue/button'
 import Card from 'primevue/card'
 import { computed } from 'vue'
 
-import { useMaintenanceTaskStore } from '../../stores/maintenanceTaskStore'
-import type { MaintenanceTask } from '../../types/desktop/maintenanceTypes'
+import { useMaintenanceTaskStore } from '@/stores/maintenanceTaskStore'
+import type { MaintenanceTask } from '@/types/desktop/maintenanceTypes'
 import { cn } from '@/utils/tailwindUtil'
-import { useMinLoadingDurationRef } from '../../utils/refUtil'
+import { useMinLoadingDurationRef } from '@/utils/refUtil'
 
 const taskStore = useMaintenanceTaskStore()
 const runner = computed(() => taskStore.getRunner(props.task))

apps/desktop-ui/src/components/maintenance/TaskListItem.vue

@@ -45,10 +45,10 @@ import Button from 'primevue/button'
 import Popover from 'primevue/popover'
 import { computed, ref } from 'vue'
 
-import { useMaintenanceTaskStore } from '../../stores/maintenanceTaskStore'
-import type { MaintenanceTask } from '../../types/desktop/maintenanceTypes'
+import { useMaintenanceTaskStore } from '@/stores/maintenanceTaskStore'
+import type { MaintenanceTask } from '@/types/desktop/maintenanceTypes'
 import type { PrimeVueSeverity } from '@/types/primeVueTypes'
-import { useMinLoadingDurationRef } from '../../utils/refUtil'
+import { useMinLoadingDurationRef } from '@/utils/refUtil'
 
 import TaskListStatusIcon from './TaskListStatusIcon.vue'
 

apps/desktop-ui/src/components/maintenance/TaskListPanel.vue

@@ -47,11 +47,11 @@ import Divider from 'primevue/divider'
 
 import { useI18n } from 'vue-i18n'
 
-import { useMaintenanceTaskStore } from '../../stores/maintenanceTaskStore'
+import { useMaintenanceTaskStore } from '@/stores/maintenanceTaskStore'
 import type {
   MaintenanceFilter,
   MaintenanceTask
-} from '../../types/desktop/maintenanceTypes'
+} from '@/types/desktop/maintenanceTypes'
 
 import TaskCard from './TaskCard.vue'
 import TaskListItem from './TaskListItem.vue'

apps/desktop-ui/src/views/MaintenanceView.vue

@@ -117,13 +117,13 @@ import { computed, onMounted, onUnmounted, ref, watch } from 'vue'
 import { useI18n } from 'vue-i18n'
 
 import RefreshButton from '@/components/common/RefreshButton.vue'
-import StatusTag from '../components/maintenance/StatusTag.vue'
-import TaskListPanel from '../components/maintenance/TaskListPanel.vue'
-import TerminalOutputDrawer from '../components/maintenance/TerminalOutputDrawer.vue'
-import { useMaintenanceTaskStore } from '../stores/maintenanceTaskStore'
-import type { MaintenanceFilter } from '../types/desktop/maintenanceTypes'
-import { electronAPI } from '../utils/envUtil'
-import { useMinLoadingDurationRef } from '../utils/refUtil'
+import StatusTag from '@/components/maintenance/StatusTag.vue'
+import TaskListPanel from '@/components/maintenance/TaskListPanel.vue'
+import TerminalOutputDrawer from '@/components/maintenance/TerminalOutputDrawer.vue'
+import { useMaintenanceTaskStore } from '@/stores/maintenanceTaskStore'
+import type { MaintenanceFilter } from '@/types/desktop/maintenanceTypes'
+import { electronAPI } from '@/utils/envUtil'
+import { useMinLoadingDurationRef } from '@/utils/refUtil'
 
 import BaseViewTemplate from './templates/BaseViewTemplate.vue'
 

tests-ui/tests/scripts/app.getNodeDefs.test.ts

@@ -65,6 +65,7 @@ describe('ComfyApp.getNodeDefs', () => {
 
     const result = await comfyApp.getNodeDefs()
 
+    // When display_name is empty, should fall back to name
     expect(result.TestNode.display_name).toBe('TestNode')
   })
 
@@ -83,6 +84,7 @@ describe('ComfyApp.getNodeDefs', () => {
     }
 
     vi.mocked(api.getNodeDefs).mockResolvedValue(mockNodeDefs)
+    // Mock st to return a translation instead of fallback
     vi.mocked(st).mockReturnValue('Translated Display Name')
 
     const result = await comfyApp.getNodeDefs()