diff --git a/webapp/frontend/src/app/data/mock/device/details/sda.ts b/webapp/frontend/src/app/data/mock/device/details/sda.ts index 9805f1c..2766943 100644 --- a/webapp/frontend/src/app/data/mock/device/details/sda.ts +++ b/webapp/frontend/src/app/data/mock/device/details/sda.ts @@ -9,6 +9,7 @@ export const sda = { "model_name": "Samsung_SSD_860_EVO_500GB", "interface_type": "SCSI", "interface_speed": "", + "host_id": "NAS", "serial_number": "S3YZNB0KBXXXXXX", "firmware": "002C", "rotational_speed": 0, diff --git a/webapp/frontend/src/app/data/mock/device/details/sdc.ts b/webapp/frontend/src/app/data/mock/device/details/sdc.ts index 6a33767..5d6935e 100644 --- a/webapp/frontend/src/app/data/mock/device/details/sdc.ts +++ b/webapp/frontend/src/app/data/mock/device/details/sdc.ts @@ -9,6 +9,7 @@ export const sdc = { "model_name": "WDC_WD140EDFZ-11A0VA0", "interface_type": "SCSI", "interface_speed": "1.5 Gb/s", + "host_id": "NAS", "serial_number": "9RK4XXXXX", "firmware": "MS1OA650", "rotational_speed": 7200, diff --git a/webapp/frontend/src/app/data/mock/summary/data.ts b/webapp/frontend/src/app/data/mock/summary/data.ts index 2893cef..7c60702 100644 --- a/webapp/frontend/src/app/data/mock/summary/data.ts +++ b/webapp/frontend/src/app/data/mock/summary/data.ts @@ -11,6 +11,7 @@ export const summary = { "manufacturer": "ATA", "model_name": "Samsung_SSD_860_EVO_500GB", "interface_type": "SCSI", + "host_id": "NAS", "interface_speed": "", "serial_number": "S3YZNB0KBXXXXXX", "firmware": "002C", @@ -386,6 +387,7 @@ export const summary = { "model_name": "WDC_WD140EDFZ-11A0VA0", "interface_type": "SCSI", "interface_speed": "1.5 Gb/s", + "host_id": "NAS", "serial_number": "9RK4XXXXX", "firmware": "MS1OA650", "rotational_speed": 7200, diff --git a/webapp/frontend/src/app/modules/dashboard/dashboard.component.ts b/webapp/frontend/src/app/modules/dashboard/dashboard.component.ts index f6d867c..c81ef81 100644 --- a/webapp/frontend/src/app/modules/dashboard/dashboard.component.ts +++ b/webapp/frontend/src/app/modules/dashboard/dashboard.component.ts @@ -166,11 +166,18 @@ export class DashboardComponent implements OnInit, AfterViewInit, OnDestroy } deviceTitle(disk){ - var title = [`/dev/${disk.device_name}`] + let title = [] + + if (disk.host_id) title.push(disk.host_id) + + title.push(`/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(' - ') } diff --git a/webapp/frontend/src/app/modules/detail/detail.component.html b/webapp/frontend/src/app/modules/detail/detail.component.html index 073ba30..0d48994 100644 --- a/webapp/frontend/src/app/modules/detail/detail.component.html +++ b/webapp/frontend/src/app/modules/detail/detail.component.html @@ -56,8 +56,12 @@