fix: Fix some UI glich on task and diagnose display

Voxelum · Mar 6, 2024 · 53aeed2 · 53aeed2
1 parent b260983
commit 53aeed2
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 13 deletions.
diff --git a/xmcl-keystone-ui/src/composables/instanceVersionDiagnose.ts b/xmcl-keystone-ui/src/composables/instanceVersionDiagnose.ts
@@ -133,7 +133,7 @@ export function useInstanceVersionDiagnose(path: Ref<string>, runtime: Ref<Runti
           }
         }
         if (commonIssues.length > 0) {
-          const options = { named: { count: commonIssues.length } }
+          const options = { count: commonIssues.length, name: commonIssues[0].library.path }
           operations.push(async () => {
             await installLibraries(commonIssues.map(v => v.library), version.id, commonIssues.length < 15)
           })
@@ -198,17 +198,17 @@ export function useInstanceVersionDiagnose(path: Ref<string>, runtime: Ref<Runti
       const assetsIssue = await diagnoseAssets(version)
       if (abortSignal.aborted) { return }
       if (assetsIssue.length > 0) {
-        const options = { named: { count: assetsIssue.length } }
+        const options = { count: assetsIssue.length, name: assetsIssue[0]?.asset.name }
         operations.push(async () => {
           await installAssets(assetsIssue.map(v => v.asset), version.id, assetsIssue.length < 15)
         })
         items.push(assetsIssue.some(v => v.type === 'corrupted')
           ? reactive({
-            title: computed(() => t('diagnosis.corruptedAssets.name', 2, options)),
+            title: computed(() => t('diagnosis.corruptedAssets.name', options, 2)),
             description: computed(() => t('diagnosis.corruptedAssets.message')),
           })
           : reactive({
-            title: computed(() => t('diagnosis.missingAssets.name', 2, options)),
+            title: computed(() => t('diagnosis.missingAssets.name', options, 2)),
             description: computed(() => t('diagnosis.missingAssets.message')),
           }),
         )

diff --git a/xmcl-keystone-ui/src/composables/taskManager.ts b/xmcl-keystone-ui/src/composables/taskManager.ts
@@ -38,10 +38,8 @@ export function useTaskManager() {
       taskId: payload.uuid,
       time: new Date(payload.time),
       message: 'error' in payload && payload.error ? markRaw(payload.error) : payload.from ?? payload.to ?? '',
-      from: payload.from ?? '',
       path: payload.path,
       param: payload.param,
-      to: payload.to ?? '',
       throughput: 0,
       rawChildren: markRaw([]),
       childrenDirty: false,
@@ -82,7 +80,6 @@ export function useTaskManager() {
         tasks.value.unshift(item)
       }
       cache[id] = new WeakRef(item)
-      // console.log(`Add task ${add.path}(${id})`)
     }
     for (const update of updates) {
       const { uuid, id, time, to, from, progress, total, chunkSize, state, error } = update
@@ -99,7 +96,7 @@ export function useTaskManager() {
           item.total = total
         }
         item.time = new Date(time)
-        item.message = Object.freeze(error) || item.message
+        item.message = Object.freeze(error) || from || to || item.message
         if (chunkSize) {
           item.throughput += chunkSize
           throughput.value += chunkSize

diff --git a/xmcl-keystone-ui/src/entities/task.ts b/xmcl-keystone-ui/src/entities/task.ts
@@ -1,12 +1,12 @@
 import type { TaskState } from '@xmcl/runtime-api'
 
 /**
- * The task item represent a task or a sub task
+ * The task item represent a task on UI or a sub task
  */
 export interface TaskItem {
   /**
-     * The unique id of this task node
-     */
+   * The unique id of this task node
+   */
   id: string
 
   /**
@@ -31,8 +31,6 @@ export interface TaskItem {
 
   path: string
   param: Record<string, any>
-  from: string
-  to: string
   message: object | string
   total: number
   progress: number