From 67d1c592a5bc3317693aa6edb1177bdfdcc31fd1 Mon Sep 17 00:00:00 2001
From: Jason Kulatunga <jason@thesparktree.com>
Date: Sat, 19 Sep 2020 11:25:19 -0600
Subject: [PATCH] include the device type in the title, if it's non-standard.

---
 .../src/app/modules/dashboard/dashboard.component.html   | 2 +-
 .../src/app/modules/dashboard/dashboard.component.ts     | 9 +++++++++
 .../src/app/modules/detail/detail.component.html         | 4 ++++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/webapp/frontend/src/app/modules/dashboard/dashboard.component.html b/webapp/frontend/src/app/modules/dashboard/dashboard.component.html
index af1bc68..68d42d7 100644
--- a/webapp/frontend/src/app/modules/dashboard/dashboard.component.html
+++ b/webapp/frontend/src/app/modules/dashboard/dashboard.component.html
@@ -66,7 +66,7 @@
                         <div class="flex items-center">
                             <div class="flex flex-col">
                                 <a [routerLink]="'/device/'+ disk.wwn"
-                                   class="font-bold text-md text-secondary uppercase tracking-wider">/dev/{{disk.device_name}} - {{disk.model_name}}</a>
+                                   class="font-bold text-md text-secondary uppercase tracking-wider">{{deviceTitle(disk)}}</a>
                                 <div [ngClass]="{'text-green': disk.smart_results[0]?.smart_status == 'passed',
                                     'text-red': disk.smart_results[0]?.smart_status == 'failed' }" class="font-medium text-sm" *ngIf="disk.smart_results[0]">
                                     Last Updated on {{disk.smart_results[0]?.date | date:'MMMM dd, yyyy' }}
diff --git a/webapp/frontend/src/app/modules/dashboard/dashboard.component.ts b/webapp/frontend/src/app/modules/dashboard/dashboard.component.ts
index a6e0b82..b244655 100644
--- a/webapp/frontend/src/app/modules/dashboard/dashboard.component.ts
+++ b/webapp/frontend/src/app/modules/dashboard/dashboard.component.ts
@@ -164,6 +164,15 @@ export class DashboardComponent implements OnInit, AfterViewInit, OnDestroy
         });
     }
 
+    deviceTitle(disk){
+        var title = [`/dev/${disk.device_name}`]
+        if (disk.device_type && disk.device_type != 'scsi' && disk.device_type != 'ata'){
+            title.push(disk.device_type)
+        }
+        title.push(disk.model_name)
+        return title.join(' - ')
+    }
+
     /**
      * Track by function for ngFor loops
      *
diff --git a/webapp/frontend/src/app/modules/detail/detail.component.html b/webapp/frontend/src/app/modules/detail/detail.component.html
index 3f64cdb..7706f90 100644
--- a/webapp/frontend/src/app/modules/detail/detail.component.html
+++ b/webapp/frontend/src/app/modules/detail/detail.component.html
@@ -56,6 +56,10 @@
                     <div class="text-2xl font-semibold leading-tight">/dev/{{data.data.device_name}}</div>
                 </div>
                 <div class="flex flex-col my-2 grid grid-cols-2">
+                    <div *ngIf="data.data.device_type && data.data.device_type != 'ata' && data.data.device_type != 'scsi'" class="my-2 col-span-2 lt-md:col-span-1">
+                        <div>{{data.data.device_type}}</div>
+                        <div class="text-secondary text-md">Device Type</div>
+                    </div>
                     <div *ngIf="data.data.manufacturer" class="my-2 col-span-2 lt-md:col-span-1">
                         <div>{{data.data.manufacturer}}</div>
                         <div class="text-secondary text-md">Model Family</div>