style: improved column and labels presentation

Signed-off-by: Pedro Lamas <[email protected]>
fluidd-core · Feb 24, 2025 · 6d2950d · 6d2950d
1 parent a58e8e6
commit 6d2950d
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 28 deletions.
diff --git a/src/components/widgets/filesystem/FileSystemBrowser.vue b/src/components/widgets/filesystem/FileSystemBrowser.vue
@@ -117,11 +117,11 @@
           </template>
 
           <template #[`item.filament_name`]="{ value }">
-            {{ value ?? '--' }}
+            {{ value || '--' }}
           </template>
 
           <template #[`item.filament_type`]="{ value }">
-            {{ value ?? '--' }}
+            {{ value || '--' }}
           </template>
 
           <template #[`item.filament_total`]="{ value }">
@@ -157,11 +157,11 @@
           </template>
 
           <template #[`item.slicer`]="{ value }">
-            {{ value ?? '--' }}
+            {{ value || '--' }}
           </template>
 
           <template #[`item.slicer_version`]="{ value }">
-            {{ value ?? '--' }}
+            {{ value || '--' }}
           </template>
 
           <template #[`item.estimated_time`]="{ value }">

diff --git a/src/components/widgets/history/JobHistory.vue b/src/components/widgets/history/JobHistory.vue
@@ -110,7 +110,7 @@
           </template>
 
           <template #[`item.user`]="{ value }">
-            {{ value }}
+            {{ value || '--' }}
           </template>
 
           <template #[`item.metadata.object_height`]="{ value }">
@@ -138,11 +138,11 @@
           </template>
 
           <template #[`item.metadata.filament_name`]="{ value }">
-            {{ value ?? '--' }}
+            {{ value || '--' }}
           </template>
 
           <template #[`item.metadata.filament_type`]="{ value }">
-            {{ value ?? '--' }}
+            {{ value || '--' }}
           </template>
 
           <template #[`item.metadata.filament_total`]="{ value }">
@@ -170,11 +170,11 @@
           </template>
 
           <template #[`item.metadata.slicer`]="{ value }">
-            {{ value ?? '--' }}
+            {{ value || '--' }}
           </template>
 
           <template #[`item.metadata.slicer_version`]="{ value }">
-            {{ value ?? '--' }}
+            {{ value || '--' }}
           </template>
 
           <template #[`item.metadata.estimated_time`]="{ value }">

diff --git a/src/components/widgets/history/JobHistoryItemStatus.vue b/src/components/widgets/history/JobHistoryItemStatus.vue
@@ -11,7 +11,7 @@
         {{ icon }}
       </v-icon>
     </template>
-    <span>{{ job.status }}</span>
+    <span>{{ $filters.prettyCase(job.status) }}</span>
   </v-tooltip>
 </template>
 
@@ -28,19 +28,21 @@ export default class JobHistoryItemStatus extends Mixins(FilesMixin) {
   readonly job!: HistoryItem
 
   get icon () {
-    const iconMap: Record<string, string> = {
-      completed: '$checkedCircle',
-      printing: '$inProgress',
-      in_progress: '$inProgress',
-      standby: '$inProgress',
-      cancelled: '$cancelled',
-      interrupted: '$cancelled'
-    }
+    switch (this.job.status) {
+      case 'completed':
+        return '$checkedCircle'
+
+      case 'printing':
+      case 'in_progress':
+        return '$inProgress'
 
-    const icon = iconMap[this.job.status]
+      case 'cancelled':
+      case 'interrupted':
+        return '$cancelled'
 
-    // Default to the warning symbol
-    return icon || '$warning'
+      default:
+        return '$warning'
+    }
   }
 
   get state (): JobHistoryItemState {
@@ -66,12 +68,5 @@ export default class JobHistoryItemStatus extends Mixins(FilesMixin) {
         return 'success'
     }
   }
-
-  get inError () {
-    return (
-      this.job.status !== 'completed' &&
-      this.job.status !== 'in_progress'
-    )
-  }
 }
 </script>