added debug logging message for detected devices.

adding a mocked class for Config.
Adding device type to Device struct. Will eventually be needed for raid drives.
adding End-to-end testing capabilties.
Added testdata json files for webserver requests.
Seperated Start code and Setup code in webapp so we can test.
renamed "smart_attributes" to "ata_attributes" - Backwards incomatible change.
Added front end device sorting (red, yellow, green)
show unknown icon/status if drive has no smart data yet.
Moved all attribute "getters" into the controller.
created a device-sort pipe.

.gitignore

@@ -60,3 +60,4 @@ vendor
 /scrutiny
 /scrutiny-collector-metrics-linux-amd64
 /scrutiny-web-linux-amd64
+scrutiny-*.db

collector/pkg/collector/metrics.go

@@ -49,6 +49,7 @@ func (mc *MetricsCollector) Run() error {
 	}
 
 	mc.logger.Infoln("Sending detected devices to API, for filtering & validation")
+	mc.logger.Debugf("Detected devices: %v", detectedStorageDevices)
 	err = mc.postJson(apiEndpoint.String(), models.DeviceWrapper{
 		Data: detectedStorageDevices,
 	}, &deviceRespWrapper)

go.mod

@@ -6,6 +6,7 @@ require (
 	github.com/analogj/go-util v0.0.0-20190301173314-5295e364eb14
 	github.com/fatih/color v1.9.0
 	github.com/gin-gonic/gin v1.6.3
+	github.com/golang/mock v1.4.3
 	github.com/jaypipes/ghw v0.6.1
 	github.com/jinzhu/gorm v1.9.14
 	github.com/kvz/logstreamer v0.0.0-20150507115422-a635b98146f0 // indirect

webapp/backend/pkg/config/mock/mock_config.go

@@ -0,0 +1,203 @@
+// Code generated by MockGen. DO NOT EDIT.
+// Source: webapp/backend/pkg/config/interface.go
+
+// Package mock_config is a generated GoMock package.
+package mock_config
+
+import (
+	gomock "github.com/golang/mock/gomock"
+	viper "github.com/spf13/viper"
+	reflect "reflect"
+)
+
+// MockInterface is a mock of Interface interface
+type MockInterface struct {
+	ctrl     *gomock.Controller
+	recorder *MockInterfaceMockRecorder
+}
+
+// MockInterfaceMockRecorder is the mock recorder for MockInterface
+type MockInterfaceMockRecorder struct {
+	mock *MockInterface
+}
+
+// NewMockInterface creates a new mock instance
+func NewMockInterface(ctrl *gomock.Controller) *MockInterface {
+	mock := &MockInterface{ctrl: ctrl}
+	mock.recorder = &MockInterfaceMockRecorder{mock}
+	return mock
+}
+
+// EXPECT returns an object that allows the caller to indicate expected use
+func (m *MockInterface) EXPECT() *MockInterfaceMockRecorder {
+	return m.recorder
+}
+
+// Init mocks base method
+func (m *MockInterface) Init() error {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "Init")
+	ret0, _ := ret[0].(error)
+	return ret0
+}
+
+// Init indicates an expected call of Init
+func (mr *MockInterfaceMockRecorder) Init() *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Init", reflect.TypeOf((*MockInterface)(nil).Init))
+}
+
+// ReadConfig mocks base method
+func (m *MockInterface) ReadConfig(configFilePath string) error {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "ReadConfig", configFilePath)
+	ret0, _ := ret[0].(error)
+	return ret0
+}
+
+// ReadConfig indicates an expected call of ReadConfig
+func (mr *MockInterfaceMockRecorder) ReadConfig(configFilePath interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ReadConfig", reflect.TypeOf((*MockInterface)(nil).ReadConfig), configFilePath)
+}
+
+// Set mocks base method
+func (m *MockInterface) Set(key string, value interface{}) {
+	m.ctrl.T.Helper()
+	m.ctrl.Call(m, "Set", key, value)
+}
+
+// Set indicates an expected call of Set
+func (mr *MockInterfaceMockRecorder) Set(key, value interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Set", reflect.TypeOf((*MockInterface)(nil).Set), key, value)
+}
+
+// SetDefault mocks base method
+func (m *MockInterface) SetDefault(key string, value interface{}) {
+	m.ctrl.T.Helper()
+	m.ctrl.Call(m, "SetDefault", key, value)
+}
+
+// SetDefault indicates an expected call of SetDefault
+func (mr *MockInterfaceMockRecorder) SetDefault(key, value interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetDefault", reflect.TypeOf((*MockInterface)(nil).SetDefault), key, value)
+}
+
+// AllSettings mocks base method
+func (m *MockInterface) AllSettings() map[string]interface{} {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "AllSettings")
+	ret0, _ := ret[0].(map[string]interface{})
+	return ret0
+}
+
+// AllSettings indicates an expected call of AllSettings
+func (mr *MockInterfaceMockRecorder) AllSettings() *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AllSettings", reflect.TypeOf((*MockInterface)(nil).AllSettings))
+}
+
+// IsSet mocks base method
+func (m *MockInterface) IsSet(key string) bool {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "IsSet", key)
+	ret0, _ := ret[0].(bool)
+	return ret0
+}
+
+// IsSet indicates an expected call of IsSet
+func (mr *MockInterfaceMockRecorder) IsSet(key interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IsSet", reflect.TypeOf((*MockInterface)(nil).IsSet), key)
+}
+
+// Get mocks base method
+func (m *MockInterface) Get(key string) interface{} {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "Get", key)
+	ret0, _ := ret[0].(interface{})
+	return ret0
+}
+
+// Get indicates an expected call of Get
+func (mr *MockInterfaceMockRecorder) Get(key interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Get", reflect.TypeOf((*MockInterface)(nil).Get), key)
+}
+
+// GetBool mocks base method
+func (m *MockInterface) GetBool(key string) bool {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "GetBool", key)
+	ret0, _ := ret[0].(bool)
+	return ret0
+}
+
+// GetBool indicates an expected call of GetBool
+func (mr *MockInterfaceMockRecorder) GetBool(key interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetBool", reflect.TypeOf((*MockInterface)(nil).GetBool), key)
+}
+
+// GetInt mocks base method
+func (m *MockInterface) GetInt(key string) int {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "GetInt", key)
+	ret0, _ := ret[0].(int)
+	return ret0
+}
+
+// GetInt indicates an expected call of GetInt
+func (mr *MockInterfaceMockRecorder) GetInt(key interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetInt", reflect.TypeOf((*MockInterface)(nil).GetInt), key)
+}
+
+// GetString mocks base method
+func (m *MockInterface) GetString(key string) string {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "GetString", key)
+	ret0, _ := ret[0].(string)
+	return ret0
+}
+
+// GetString indicates an expected call of GetString
+func (mr *MockInterfaceMockRecorder) GetString(key interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetString", reflect.TypeOf((*MockInterface)(nil).GetString), key)
+}
+
+// GetStringSlice mocks base method
+func (m *MockInterface) GetStringSlice(key string) []string {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "GetStringSlice", key)
+	ret0, _ := ret[0].([]string)
+	return ret0
+}
+
+// GetStringSlice indicates an expected call of GetStringSlice
+func (mr *MockInterfaceMockRecorder) GetStringSlice(key interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetStringSlice", reflect.TypeOf((*MockInterface)(nil).GetStringSlice), key)
+}
+
+// UnmarshalKey mocks base method
+func (m *MockInterface) UnmarshalKey(key string, rawVal interface{}, decoderOpts ...viper.DecoderConfigOption) error {
+	m.ctrl.T.Helper()
+	varargs := []interface{}{key, rawVal}
+	for _, a := range decoderOpts {
+		varargs = append(varargs, a)
+	}
+	ret := m.ctrl.Call(m, "UnmarshalKey", varargs...)
+	ret0, _ := ret[0].(error)
+	return ret0
+}
+
+// UnmarshalKey indicates an expected call of UnmarshalKey
+func (mr *MockInterfaceMockRecorder) UnmarshalKey(key, rawVal interface{}, decoderOpts ...interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	varargs := append([]interface{}{key, rawVal}, decoderOpts...)
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UnmarshalKey", reflect.TypeOf((*MockInterface)(nil).UnmarshalKey), varargs...)
+}

webapp/backend/pkg/models/db/device.go

@@ -25,20 +25,20 @@ type Device struct {
 
 	WWN string `json:"wwn" gorm:"primary_key"`
 
-	DeviceName     string `json:"device_name"`
+	DeviceName     string  `json:"device_name"`
-	Manufacturer   string `json:"manufacturer"`
+	Manufacturer   string  `json:"manufacturer"`
-	ModelName      string `json:"model_name"`
+	ModelName      string  `json:"model_name"`
-	InterfaceType  string `json:"interface_type"`
+	InterfaceType  string  `json:"interface_type"`
-	InterfaceSpeed string `json:"interface_speed"`
+	InterfaceSpeed string  `json:"interface_speed"`
-	SerialNumber   string `json:"serial_number"`
+	SerialNumber   string  `json:"serial_number"`
-	Firmware       string `json:"firmware"`
+	Firmware       string  `json:"firmware"`
-	RotationSpeed  int    `json:"rotational_speed"`
+	RotationSpeed  int     `json:"rotational_speed"`
-	Capacity       int64  `json:"capacity"`
+	Capacity       int64   `json:"capacity"`
-	FormFactor     string `json:"form_factor"`
+	FormFactor     string  `json:"form_factor"`
-	SmartSupport   bool   `json:"smart_support"`
+	SmartSupport   bool    `json:"smart_support"`
-	DeviceProtocol string `json:"device_protocol"`
+	DeviceProtocol string  `json:"device_protocol"`
-
+	DeviceType     string  `json:"device_type"` //device type is used for querying with -d/t flag
-	SmartResults []Smart `gorm:"foreignkey:DeviceWWN" json:"smart_results"`
+	SmartResults   []Smart `gorm:"foreignkey:DeviceWWN" json:"smart_results"`
 }
 
 func (dv *Device) IsAta() bool {
@@ -169,6 +169,7 @@ func (dv *Device) UpdateFromCollectorSmartInfo(info collector.SmartInfo) error {
 	dv.Capacity = info.UserCapacity.Bytes
 	dv.FormFactor = info.FormFactor.Name
 	dv.DeviceProtocol = info.Device.Protocol
+	dv.DeviceType = info.Device.Type
 	if len(info.Vendor) > 0 {
 		dv.Manufacturer = info.Vendor
 	}

webapp/backend/pkg/web/server.go

@@ -13,7 +13,7 @@ type AppEngine struct {
 	Config config.Interface
 }
 
-func (ae *AppEngine) Start() error {
+func (ae *AppEngine) Setup() *gin.Engine {
 	r := gin.Default()
 
 	r.Use(database.DatabaseHandler(ae.Config.GetString("web.database.location")))
@@ -46,6 +46,11 @@ func (ae *AppEngine) Start() error {
 	r.NoRoute(func(c *gin.Context) {
 		c.File(fmt.Sprintf("%s/index.html", ae.Config.GetString("web.src.frontend.path")))
 	})
+	return r
+}
+
+func (ae *AppEngine) Start() error {
+	r := ae.Setup()
 
 	return r.Run(fmt.Sprintf("%s:%s", ae.Config.GetString("web.listen.host"), ae.Config.GetString("web.listen.port")))
 }

webapp/backend/pkg/web/server_test.go

@@ -0,0 +1,149 @@
+package web_test
+
+import (
+	mock_config "github.com/analogj/scrutiny/webapp/backend/pkg/config/mock"
+	"github.com/analogj/scrutiny/webapp/backend/pkg/web"
+	"github.com/golang/mock/gomock"
+	"github.com/stretchr/testify/require"
+	"net/http"
+	"net/http/httptest"
+	"os"
+	"testing"
+)
+
+func TestHealthRoute(t *testing.T) {
+	//setup
+	mockCtrl := gomock.NewController(t)
+	defer mockCtrl.Finish()
+	fakeConfig := mock_config.NewMockInterface(mockCtrl)
+	fakeConfig.EXPECT().GetString("web.database.location").Return("testdata/scrutiny_test.db")
+	fakeConfig.EXPECT().GetString("web.src.frontend.path").Return("testdata")
+
+	ae := web.AppEngine{
+		Config: fakeConfig,
+	}
+
+	router := ae.Setup()
+
+	//test
+	w := httptest.NewRecorder()
+	req, _ := http.NewRequest("GET", "/api/health", nil)
+	router.ServeHTTP(w, req)
+
+	//assert
+	require.Equal(t, 200, w.Code)
+	require.Equal(t, "{\"success\":true}", w.Body.String())
+}
+
+func TestRegisterDevicesRoute(t *testing.T) {
+	//setup
+	mockCtrl := gomock.NewController(t)
+	defer mockCtrl.Finish()
+	fakeConfig := mock_config.NewMockInterface(mockCtrl)
+	fakeConfig.EXPECT().GetString("web.database.location").Return("testdata/scrutiny_test.db")
+	fakeConfig.EXPECT().GetString("web.src.frontend.path").Return("testdata")
+	ae := web.AppEngine{
+		Config: fakeConfig,
+	}
+	router := ae.Setup()
+	file, err := os.Open("testdata/register-devices-req.json")
+	require.NoError(t, err)
+
+	//test
+	w := httptest.NewRecorder()
+	req, _ := http.NewRequest("POST", "/api/devices/register", file)
+	router.ServeHTTP(w, req)
+
+	//assert
+	require.Equal(t, 200, w.Code)
+}
+
+func TestUploadDeviceMetricsRoute(t *testing.T) {
+	//setup
+	mockCtrl := gomock.NewController(t)
+	defer mockCtrl.Finish()
+	fakeConfig := mock_config.NewMockInterface(mockCtrl)
+	fakeConfig.EXPECT().GetString("web.database.location").AnyTimes().Return("testdata/scrutiny_test.db")
+	fakeConfig.EXPECT().GetString("web.src.frontend.path").AnyTimes().Return("testdata")
+	ae := web.AppEngine{
+		Config: fakeConfig,
+	}
+	router := ae.Setup()
+	devicesfile, err := os.Open("testdata/register-devices-single-req.json")
+	require.NoError(t, err)
+
+	metricsfile, err := os.Open("testdata/upload-device-metrics-req.json")
+	require.NoError(t, err)
+
+	//test
+	wr := httptest.NewRecorder()
+	req, _ := http.NewRequest("POST", "/api/devices/register", devicesfile)
+	router.ServeHTTP(wr, req)
+	require.Equal(t, 200, wr.Code)
+
+	mr := httptest.NewRecorder()
+	req, _ = http.NewRequest("POST", "/api/device/0x5000cca264eb01d7/smart", metricsfile)
+	router.ServeHTTP(mr, req)
+	require.Equal(t, 200, mr.Code)
+
+	//assert
+}
+
+func TestPopulateMultiple(t *testing.T) {
+	//setup
+	mockCtrl := gomock.NewController(t)
+	defer mockCtrl.Finish()
+	fakeConfig := mock_config.NewMockInterface(mockCtrl)
+	fakeConfig.EXPECT().GetString("web.database.location").AnyTimes().Return("testdata/scrutiny_test.db")
+	fakeConfig.EXPECT().GetString("web.src.frontend.path").AnyTimes().Return("testdata")
+	ae := web.AppEngine{
+		Config: fakeConfig,
+	}
+	router := ae.Setup()
+	devicesfile, err := os.Open("testdata/register-devices-req.json")
+	require.NoError(t, err)
+
+	metricsfile, err := os.Open("../models/testdata/smart-ata.json")
+	require.NoError(t, err)
+	failfile, err := os.Open("../models/testdata/smart-fail2.json")
+	require.NoError(t, err)
+	nvmefile, err := os.Open("../models/testdata/smart-nvme.json")
+	require.NoError(t, err)
+	scsifile, err := os.Open("../models/testdata/smart-scsi.json")
+	require.NoError(t, err)
+	scsi2file, err := os.Open("../models/testdata/smart-scsi2.json")
+	require.NoError(t, err)
+
+	//test
+	wr := httptest.NewRecorder()
+	req, _ := http.NewRequest("POST", "/api/devices/register", devicesfile)
+	router.ServeHTTP(wr, req)
+	require.Equal(t, 200, wr.Code)
+
+	mr := httptest.NewRecorder()
+	req, _ = http.NewRequest("POST", "/api/device/0x5000cca264eb01d7/smart", metricsfile)
+	router.ServeHTTP(mr, req)
+	require.Equal(t, 200, mr.Code)
+
+	fr := httptest.NewRecorder()
+	req, _ = http.NewRequest("POST", "/api/device/0x5000cca264ec3183/smart", failfile)
+	router.ServeHTTP(fr, req)
+	require.Equal(t, 200, fr.Code)
+
+	nr := httptest.NewRecorder()
+	req, _ = http.NewRequest("POST", "/api/device/0x5002538e40a22954/smart", nvmefile)
+	router.ServeHTTP(nr, req)
+	require.Equal(t, 200, nr.Code)
+
+	sr := httptest.NewRecorder()
+	req, _ = http.NewRequest("POST", "/api/device/0x5000cca252c859cc/smart", scsifile)
+	router.ServeHTTP(sr, req)
+	require.Equal(t, 200, sr.Code)
+
+	s2r := httptest.NewRecorder()
+	req, _ = http.NewRequest("POST", "/api/device/0x5000cca264ebc248/smart", scsi2file)
+	router.ServeHTTP(s2r, req)
+	require.Equal(t, 200, s2r.Code)
+
+	//assert
+}

webapp/backend/pkg/web/testdata/register-devices-req.json

@@ -0,0 +1,102 @@
+{
+  "data": [
+    {
+      "wwn": "0x5002538e40a22954",
+      "device_name": "sda",
+      "manufacturer": "ATA",
+      "model_name": "Samsung_SSD_860_EVO_500GB",
+      "interface_type": "SCSI",
+      "interface_speed": "",
+      "serial_number": "S3YZNB0KBXXXXXX",
+      "firmware": "",
+      "rotational_speed": 0,
+      "capacity": 500107862016,
+      "form_factor": "",
+      "smart_support": false
+    },
+    {
+      "wwn": "0x5000cca264eb01d7",
+      "device_name": "sdb",
+      "manufacturer": "ATA",
+      "model_name": "WDC_WD140EDFZ-11A0VA0",
+      "interface_type": "SCSI",
+      "interface_speed": "",
+      "serial_number": "9RK1XXXXX",
+      "firmware": "",
+      "rotational_speed": 0,
+      "capacity": 14000519643136,
+      "form_factor": "",
+      "smart_support": false
+    },
+    {
+      "wwn": "0x5000cca264ec3183",
+      "device_name": "sdc",
+      "manufacturer": "ATA",
+      "model_name": "WDC_WD140EDFZ-11A0VA0",
+      "interface_type": "SCSI",
+      "interface_speed": "",
+      "serial_number": "9RK4XXXXX",
+      "firmware": "",
+      "rotational_speed": 0,
+      "capacity": 14000519643136,
+      "form_factor": "",
+      "smart_support": false
+    },
+    {
+      "wwn": "0x5000cca252c859cc",
+      "device_name": "sdd",
+      "manufacturer": "ATA",
+      "model_name": "WDC_WD80EFAX-68LHPN0",
+      "interface_type": "SCSI",
+      "interface_speed": "",
+      "serial_number": "7SGLXXXXX",
+      "firmware": "",
+      "rotational_speed": 0,
+      "capacity": 8001563222016,
+      "form_factor": "",
+      "smart_support": false
+    },
+    {
+      "wwn": "0x5000cca264ebc248",
+      "device_name": "sde",
+      "manufacturer": "ATA",
+      "model_name": "WDC_WD140EDFZ-11A0VA0",
+      "interface_type": "SCSI",
+      "interface_speed": "",
+      "serial_number": "9RK3XXXXX",
+      "firmware": "",
+      "rotational_speed": 0,
+      "capacity": 14000519643136,
+      "form_factor": "",
+      "smart_support": false
+    },
+    {
+      "wwn": "0x50014ee20b2a72a9",
+      "device_name": "sdf",
+      "manufacturer": "ATA",
+      "model_name": "WDC_WD60EFRX-68MYMN1",
+      "interface_type": "SCSI",
+      "interface_speed": "",
+      "serial_number": "WD-WXL1HXXXXX",
+      "firmware": "",
+      "rotational_speed": 0,
+      "capacity": 6001175126016,
+      "form_factor": "",
+      "smart_support": false
+    },
+    {
+      "wwn": "0x5000c500673e6b5f",
+      "device_name": "sdg",
+      "manufacturer": "ATA",
+      "model_name": "ST6000DX000-1H217Z",
+      "interface_type": "SCSI",
+      "interface_speed": "",
+      "serial_number": "Z4DXXXXX",
+      "firmware": "",
+      "rotational_speed": 0,
+      "capacity": 6001175126016,
+      "form_factor": "",
+      "smart_support": false
+    }
+  ]
+}

webapp/backend/pkg/web/testdata/register-devices-single-req.json

@@ -0,0 +1,18 @@
+{
+  "data": [
+    {
+      "wwn": "0x5000cca264eb01d7",
+      "device_name": "sdb",
+      "manufacturer": "ATA",
+      "model_name": "WDC_WD140EDFZ-11A0VA0",
+      "interface_type": "SCSI",
+      "interface_speed": "",
+      "serial_number": "9RK1XXXXX",
+      "firmware": "",
+      "rotational_speed": 0,
+      "capacity": 14000519643136,
+      "form_factor": "",
+      "smart_support": false
+    }
+  ]
+}

webapp/backend/pkg/web/testdata/upload-device-metrics-req.json

@@ -0,0 +1,846 @@
+{
+  "json_format_version": [
+    1,
+    0
+  ],
+  "smartctl": {
+    "version": [
+      7,
+      0
+    ],
+    "svn_revision": "4883",
+    "platform_info": "x86_64-linux-4.19.128-flatcar",
+    "build_info": "(local build)",
+    "argv": [
+      "smartctl",
+      "-j",
+      "-a",
+      "/dev/sdb"
+    ],
+    "exit_status": 0
+  },
+  "device": {
+    "name": "/dev/sdb",
+    "info_name": "/dev/sdb [SAT]",
+    "type": "sat",
+    "protocol": "ATA"
+  },
+  "model_name": "WDC WD140EDFZ-11A0VA0",
+  "serial_number": "9RK1XXXX",
+  "wwn": {
+    "naa": 5,
+    "oui": 3274,
+    "id": 10283057623
+  },
+  "firmware_version": "81.00A81",
+  "user_capacity": {
+    "blocks": 27344764928,
+    "bytes": 14000519643136
+  },
+  "logical_block_size": 512,
+  "physical_block_size": 4096,
+  "rotation_rate": 5400,
+  "form_factor": {
+    "ata_value": 2,
+    "name": "3.5 inches"
+  },
+  "in_smartctl_database": false,
+  "ata_version": {
+    "string": "ACS-2, ATA8-ACS T13/1699-D revision 4",
+    "major_value": 1020,
+    "minor_value": 41
+  },
+  "sata_version": {
+    "string": "SATA 3.2",
+    "value": 255
+  },
+  "interface_speed": {
+    "max": {
+      "sata_value": 14,
+      "string": "6.0 Gb/s",
+      "units_per_second": 60,
+      "bits_per_unit": 100000000
+    },
+    "current": {
+      "sata_value": 3,
+      "string": "6.0 Gb/s",
+      "units_per_second": 60,
+      "bits_per_unit": 100000000
+    }
+  },
+  "local_time": {
+    "time_t": 1592697810,
+    "asctime": "Sun Jun 21 00:03:30 2020 UTC"
+  },
+  "smart_status": {
+    "passed": true
+  },
+  "ata_smart_data": {
+    "offline_data_collection": {
+      "status": {
+        "value": 130,
+        "string": "was completed without error",
+        "passed": true
+      },
+      "completion_seconds": 101
+    },
+    "self_test": {
+      "status": {
+        "value": 241,
+        "string": "in progress, 10% remaining",
+        "remaining_percent": 10
+      },
+      "polling_minutes": {
+        "short": 2,
+        "extended": 1479
+      }
+    },
+    "capabilities": {
+      "values": [
+        91,
+        3
+      ],
+      "exec_offline_immediate_supported": true,
+      "offline_is_aborted_upon_new_cmd": false,
+      "offline_surface_scan_supported": true,
+      "self_tests_supported": true,
+      "conveyance_self_test_supported": false,
+      "selective_self_test_supported": true,
+      "attribute_autosave_enabled": true,
+      "error_logging_supported": true,
+      "gp_logging_supported": true
+    }
+  },
+  "ata_sct_capabilities": {
+    "value": 61,
+    "error_recovery_control_supported": true,
+    "feature_control_supported": true,
+    "data_table_supported": true
+  },
+  "ata_smart_attributes": {
+    "revision": 16,
+    "table": [
+      {
+        "id": 1,
+        "name": "Raw_Read_Error_Rate",
+        "value": 100,
+        "worst": 100,
+        "thresh": 1,
+        "when_failed": "",
+        "flags": {
+          "value": 11,
+          "string": "PO-R-- ",
+          "prefailure": true,
+          "updated_online": true,
+          "performance": false,
+          "error_rate": true,
+          "event_count": false,
+          "auto_keep": false
+        },
+        "raw": {
+          "value": 0,
+          "string": "0"
+        }
+      },
+      {
+        "id": 2,
+        "name": "Throughput_Performance",
+        "value": 135,
+        "worst": 135,
+        "thresh": 54,
+        "when_failed": "",
+        "flags": {
+          "value": 4,
+          "string": "--S--- ",
+          "prefailure": false,
+          "updated_online": false,
+          "performance": true,
+          "error_rate": false,
+          "event_count": false,
+          "auto_keep": false
+        },
+        "raw": {
+          "value": 108,
+          "string": "108"
+        }
+      },
+      {
+        "id": 3,
+        "name": "Spin_Up_Time",
+        "value": 81,
+        "worst": 81,
+        "thresh": 1,
+        "when_failed": "",
+        "flags": {
+          "value": 7,
+          "string": "POS--- ",
+          "prefailure": true,
+          "updated_online": true,
+          "performance": true,
+          "error_rate": false,
+          "event_count": false,
+          "auto_keep": false
+        },
+        "raw": {
+          "value": 30089675132,
+          "string": "380 (Average 380)"
+        }
+      },
+      {
+        "id": 4,
+        "name": "Start_Stop_Count",
+        "value": 100,
+        "worst": 100,
+        "thresh": 0,
+        "when_failed": "",
+        "flags": {
+          "value": 18,
+          "string": "-O--C- ",
+          "prefailure": false,
+          "updated_online": true,
+          "performance": false,
+          "error_rate": false,
+          "event_count": true,
+          "auto_keep": false
+        },
+        "raw": {
+          "value": 9,
+          "string": "9"
+        }
+      },
+      {
+        "id": 5,
+        "name": "Reallocated_Sector_Ct",
+        "value": 100,
+        "worst": 100,
+        "thresh": 1,
+        "when_failed": "",
+        "flags": {
+          "value": 51,
+          "string": "PO--CK ",
+          "prefailure": true,
+          "updated_online": true,
+          "performance": false,
+          "error_rate": false,
+          "event_count": true,
+          "auto_keep": true
+        },
+        "raw": {
+          "value": 0,
+          "string": "0"
+        }
+      },
+      {
+        "id": 7,
+        "name": "Seek_Error_Rate",
+        "value": 100,
+        "worst": 100,
+        "thresh": 1,
+        "when_failed": "",
+        "flags": {
+          "value": 10,
+          "string": "-O-R-- ",
+          "prefailure": false,
+          "updated_online": true,
+          "performance": false,
+          "error_rate": true,
+          "event_count": false,
+          "auto_keep": false
+        },
+        "raw": {
+          "value": 0,
+          "string": "0"
+        }
+      },
+      {
+        "id": 8,
+        "name": "Seek_Time_Performance",
+        "value": 133,
+        "worst": 133,
+        "thresh": 20,
+        "when_failed": "",
+        "flags": {
+          "value": 4,
+          "string": "--S--- ",
+          "prefailure": false,
+          "updated_online": false,
+          "performance": true,
+          "error_rate": false,
+          "event_count": false,
+          "auto_keep": false
+        },
+        "raw": {
+          "value": 18,
+          "string": "18"
+        }
+      },
+      {
+        "id": 9,
+        "name": "Power_On_Hours",
+        "value": 100,
+        "worst": 100,
+        "thresh": 0,
+        "when_failed": "",
+        "flags": {
+          "value": 18,
+          "string": "-O--C- ",
+          "prefailure": false,
+          "updated_online": true,
+          "performance": false,
+          "error_rate": false,
+          "event_count": true,
+          "auto_keep": false
+        },
+        "raw": {
+          "value": 1730,
+          "string": "1730"
+        }
+      },
+      {
+        "id": 10,
+        "name": "Spin_Retry_Count",
+        "value": 100,
+        "worst": 100,
+        "thresh": 1,
+        "when_failed": "",
+        "flags": {
+          "value": 18,
+          "string": "-O--C- ",
+          "prefailure": false,
+          "updated_online": true,
+          "performance": false,
+          "error_rate": false,
+          "event_count": true,
+          "auto_keep": false
+        },
+        "raw": {
+          "value": 0,
+          "string": "0"
+        }
+      },
+      {
+        "id": 12,
+        "name": "Power_Cycle_Count",
+        "value": 100,
+        "worst": 100,
+        "thresh": 0,
+        "when_failed": "",
+        "flags": {
+          "value": 50,
+          "string": "-O--CK ",
+          "prefailure": false,
+          "updated_online": true,
+          "performance": false,
+          "error_rate": false,
+          "event_count": true,
+          "auto_keep": true
+        },
+        "raw": {
+          "value": 9,
+          "string": "9"
+        }
+      },
+      {
+        "id": 22,
+        "name": "Unknown_Attribute",
+        "value": 100,
+        "worst": 100,
+        "thresh": 25,
+        "when_failed": "",
+        "flags": {
+          "value": 35,
+          "string": "PO---K ",
+          "prefailure": true,
+          "updated_online": true,
+          "performance": false,
+          "error_rate": false,
+          "event_count": false,
+          "auto_keep": true
+        },
+        "raw": {
+          "value": 100,
+          "string": "100"
+        }
+      },
+      {
+        "id": 192,
+        "name": "Power-Off_Retract_Count",
+        "value": 100,
+        "worst": 100,
+        "thresh": 0,
+        "when_failed": "",
+        "flags": {
+          "value": 50,
+          "string": "-O--CK ",
+          "prefailure": false,
+          "updated_online": true,
+          "performance": false,
+          "error_rate": false,
+          "event_count": true,
+          "auto_keep": true
+        },
+        "raw": {
+          "value": 329,
+          "string": "329"
+        }
+      },
+      {
+        "id": 193,
+        "name": "Load_Cycle_Count",
+        "value": 100,
+        "worst": 100,
+        "thresh": 0,
+        "when_failed": "",
+        "flags": {
+          "value": 18,
+          "string": "-O--C- ",
+          "prefailure": false,
+          "updated_online": true,
+          "performance": false,
+          "error_rate": false,
+          "event_count": true,
+          "auto_keep": false
+        },
+        "raw": {
+          "value": 329,
+          "string": "329"
+        }
+      },
+      {
+        "id": 194,
+        "name": "Temperature_Celsius",
+        "value": 51,
+        "worst": 51,
+        "thresh": 0,
+        "when_failed": "",
+        "flags": {
+          "value": 2,
+          "string": "-O---- ",
+          "prefailure": false,
+          "updated_online": true,
+          "performance": false,
+          "error_rate": false,
+          "event_count": false,
+          "auto_keep": false
+        },
+        "raw": {
+          "value": 163210330144,
+          "string": "32 (Min/Max 24/38)"
+        }
+      },
+      {
+        "id": 196,
+        "name": "Reallocated_Event_Count",
+        "value": 100,
+        "worst": 100,
+        "thresh": 0,
+        "when_failed": "",
+        "flags": {
+          "value": 50,
+          "string": "-O--CK ",
+          "prefailure": false,
+          "updated_online": true,
+          "performance": false,
+          "error_rate": false,
+          "event_count": true,
+          "auto_keep": true
+        },
+        "raw": {
+          "value": 0,
+          "string": "0"
+        }
+      },
+      {
+        "id": 197,
+        "name": "Current_Pending_Sector",
+        "value": 100,
+        "worst": 100,
+        "thresh": 0,
+        "when_failed": "",
+        "flags": {
+          "value": 34,
+          "string": "-O---K ",
+          "prefailure": false,
+          "updated_online": true,
+          "performance": false,
+          "error_rate": false,
+          "event_count": false,
+          "auto_keep": true
+        },
+        "raw": {
+          "value": 0,
+          "string": "0"
+        }
+      },
+      {
+        "id": 198,
+        "name": "Offline_Uncorrectable",
+        "value": 100,
+        "worst": 100,
+        "thresh": 0,
+        "when_failed": "",
+        "flags": {
+          "value": 8,
+          "string": "---R-- ",
+          "prefailure": false,
+          "updated_online": false,
+          "performance": false,
+          "error_rate": true,
+          "event_count": false,
+          "auto_keep": false
+        },
+        "raw": {
+          "value": 0,
+          "string": "0"
+        }
+      },
+      {
+        "id": 199,
+        "name": "UDMA_CRC_Error_Count",
+        "value": 100,
+        "worst": 100,
+        "thresh": 0,
+        "when_failed": "",
+        "flags": {
+          "value": 10,
+          "string": "-O-R-- ",
+          "prefailure": false,
+          "updated_online": true,
+          "performance": false,
+          "error_rate": true,
+          "event_count": false,
+          "auto_keep": false
+        },
+        "raw": {
+          "value": 0,
+          "string": "0"
+        }
+      }
+    ]
+  },
+  "power_on_time": {
+    "hours": 1730
+  },
+  "power_cycle_count": 9,
+  "temperature": {
+    "current": 32
+  },
+  "ata_smart_error_log": {
+    "summary": {
+      "revision": 1,
+      "count": 0
+    }
+  },
+  "ata_smart_self_test_log": {
+    "standard": {
+      "revision": 1,
+      "table": [
+        {
+          "type": {
+            "value": 1,
+            "string": "Short offline"
+          },
+          "status": {
+            "value": 0,
+            "string": "Completed without error",
+            "passed": true
+          },
+          "lifetime_hours": 1708
+        },
+        {
+          "type": {
+            "value": 1,
+            "string": "Short offline"
+          },
+          "status": {
+            "value": 0,
+            "string": "Completed without error",
+            "passed": true
+          },
+          "lifetime_hours": 1684
+        },
+        {
+          "type": {
+            "value": 1,
+            "string": "Short offline"
+          },
+          "status": {
+            "value": 0,
+            "string": "Completed without error",
+            "passed": true
+          },
+          "lifetime_hours": 1661
+        },
+        {
+          "type": {
+            "value": 1,
+            "string": "Short offline"
+          },
+          "status": {
+            "value": 0,
+            "string": "Completed without error",
+            "passed": true
+          },
+          "lifetime_hours": 1636
+        },
+        {
+          "type": {
+            "value": 2,
+            "string": "Extended offline"
+          },
+          "status": {
+            "value": 0,
+            "string": "Completed without error",
+            "passed": true
+          },
+          "lifetime_hours": 1624
+        },
+        {
+          "type": {
+            "value": 1,
+            "string": "Short offline"
+          },
+          "status": {
+            "value": 0,
+            "string": "Completed without error",
+            "passed": true
+          },
+          "lifetime_hours": 1541
+        },
+        {
+          "type": {
+            "value": 1,
+            "string": "Short offline"
+          },
+          "status": {
+            "value": 0,
+            "string": "Completed without error",
+            "passed": true
+          },
+          "lifetime_hours": 1517
+        },
+        {
+          "type": {
+            "value": 1,
+            "string": "Short offline"
+          },
+          "status": {
+            "value": 0,
+            "string": "Completed without error",
+            "passed": true
+          },
+          "lifetime_hours": 1493
+        },
+        {
+          "type": {
+            "value": 1,
+            "string": "Short offline"
+          },
+          "status": {
+            "value": 0,
+            "string": "Completed without error",
+            "passed": true
+          },
+          "lifetime_hours": 1469
+        },
+        {
+          "type": {
+            "value": 1,
+            "string": "Short offline"
+          },
+          "status": {
+            "value": 0,
+            "string": "Completed without error",
+            "passed": true
+          },
+          "lifetime_hours": 1445
+        },
+        {
+          "type": {
+            "value": 2,
+            "string": "Extended offline"
+          },
+          "status": {
+            "value": 0,
+            "string": "Completed without error",
+            "passed": true
+          },
+          "lifetime_hours": 1439
+        },
+        {
+          "type": {
+            "value": 1,
+            "string": "Short offline"
+          },
+          "status": {
+            "value": 0,
+            "string": "Completed without error",
+            "passed": true
+          },
+          "lifetime_hours": 1373
+        },
+        {
+          "type": {
+            "value": 1,
+            "string": "Short offline"
+          },
+          "status": {
+            "value": 0,
+            "string": "Completed without error",
+            "passed": true
+          },
+          "lifetime_hours": 1349
+        },
+        {
+          "type": {
+            "value": 1,
+            "string": "Short offline"
+          },
+          "status": {
+            "value": 0,
+            "string": "Completed without error",
+            "passed": true
+          },
+          "lifetime_hours": 1325
+        },
+        {
+          "type": {
+            "value": 1,
+            "string": "Short offline"
+          },
+          "status": {
+            "value": 0,
+            "string": "Completed without error",
+            "passed": true
+          },
+          "lifetime_hours": 1301
+        },
+        {
+          "type": {
+            "value": 1,
+            "string": "Short offline"
+          },
+          "status": {
+            "value": 0,
+            "string": "Completed without error",
+            "passed": true
+          },
+          "lifetime_hours": 1277
+        },
+        {
+          "type": {
+            "value": 1,
+            "string": "Short offline"
+          },
+          "status": {
+            "value": 0,
+            "string": "Completed without error",
+            "passed": true
+          },
+          "lifetime_hours": 1253
+        },
+        {
+          "type": {
+            "value": 2,
+            "string": "Extended offline"
+          },
+          "status": {
+            "value": 0,
+            "string": "Completed without error",
+            "passed": true
+          },
+          "lifetime_hours": 1252
+        },
+        {
+          "type": {
+            "value": 1,
+            "string": "Short offline"
+          },
+          "status": {
+            "value": 0,
+            "string": "Completed without error",
+            "passed": true
+          },
+          "lifetime_hours": 1205
+        },
+        {
+          "type": {
+            "value": 1,
+            "string": "Short offline"
+          },
+          "status": {
+            "value": 0,
+            "string": "Completed without error",
+            "passed": true
+          },
+          "lifetime_hours": 1181
+        },
+        {
+          "type": {
+            "value": 1,
+            "string": "Short offline"
+          },
+          "status": {
+            "value": 0,
+            "string": "Completed without error",
+            "passed": true
+          },
+          "lifetime_hours": 1157
+        }
+      ],
+      "count": 21,
+      "error_count_total": 0,
+      "error_count_outdated": 0
+    }
+  },
+  "ata_smart_selective_self_test_log": {
+    "revision": 1,
+    "table": [
+      {
+        "lba_min": 0,
+        "lba_max": 0,
+        "status": {
+          "value": 241,
+          "string": "Not_testing"
+        }
+      },
+      {
+        "lba_min": 0,
+        "lba_max": 0,
+        "status": {
+          "value": 241,
+          "string": "Not_testing"
+        }
+      },
+      {
+        "lba_min": 0,
+        "lba_max": 0,
+        "status": {
+          "value": 241,
+          "string": "Not_testing"
+        }
+      },
+      {
+        "lba_min": 0,
+        "lba_max": 0,
+        "status": {
+          "value": 241,
+          "string": "Not_testing"
+        }
+      },
+      {
+        "lba_min": 0,
+        "lba_max": 0,
+        "status": {
+          "value": 241,
+          "string": "Not_testing"
+        }
+      }
+    ],
+    "flags": {
+      "value": 0,
+      "remainder_scan_enabled": false
+    },
+    "power_up_scan_resume_minutes": 0
+  }
+}

webapp/frontend/src/app/data/mock/device/details/data.ts

@@ -31,7 +31,7 @@ export const details = {
                 "temp": 35,
                 "power_on_hours": 48706,
                 "power_cycle_count": 69,
-                "smart_attributes": [
+                "ata_attributes": [
                     {
                         "ID": 2632,
                         "CreatedAt": "2020-08-14T03:41:00.763627397Z",

webapp/frontend/src/app/modules/admin/dashboard/dashboard.component.html

@@ -51,8 +51,9 @@
 
             <div class="flex flex-wrap w-full">
 
-                <div *ngFor="let disk of data.data " class="flex w-1/2 min-w-80 p-4">
+                <div *ngFor="let disk of data.data | deviceSort" class="flex w-1/2 min-w-80 p-4">
-                    <div [ngClass]="{'border-green': disk.smart_results[0]?.smart_status == 'passed', 'border-red': disk.smart_results[0]?.smart_status == 'failed'}"
+                    <div [ngClass]="{'border-green': disk.smart_results[0]?.smart_status == 'passed',
+                                    'border-red': disk.smart_results[0]?.smart_status == 'failed' }"
                          class="relative flex flex-col flex-auto p-6 pr-3 pb-3 bg-card rounded border-l-4 shadow-md overflow-hidden">
                         <div class="absolute bottom-0 right-0 w-24 h-24 -m-6">
                             <mat-icon class="icon-size-96 opacity-12 text-green"
@@ -61,12 +62,16 @@
                             <mat-icon class="icon-size-96 opacity-12 text-red"
                                       *ngIf="disk.smart_results[0]?.smart_status == 'failed'"
                                       [svgIcon]="'heroicons_outline:exclamation-circle'"></mat-icon>
+                            <mat-icon class="icon-size-96 opacity-12 text-yellow"
+                                      *ngIf="!disk.smart_results[0]"
+                                      [svgIcon]="'heroicons_outline:question-mark-circle'"></mat-icon>
                         </div>
                         <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>
-                                <div class="text-green font-medium text-sm">
+                                <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' }}
                                 </div>
                             </div>
@@ -89,11 +94,13 @@
                         <div class="flex flex-row flex-wrap mt-4 -mx-6">
                             <div class="flex flex-col mx-6 my-3 xs:w-full">
                                 <div class="font-semibold text-xs text-hint uppercase tracking-wider leading-none">S.M.A.R.T</div>
-                                <div class="mt-2 font-medium text-3xl leading-none">{{ disk.smart_results[0]?.smart_status | titlecase}}</div>
+                                <div class="mt-2 font-medium text-3xl leading-none" *ngIf="disk.smart_results[0]; else unknownStatus">{{ disk.smart_results[0]?.smart_status | titlecase}}</div>
+                                <ng-template #unknownStatus><div class="mt-2 font-medium text-3xl leading-none">No Data</div></ng-template>
                             </div>
                             <div class="flex flex-col mx-6 my-3 xs:w-full">
                                 <div class="font-semibold text-xs text-hint uppercase tracking-wider leading-none">Temperature</div>
-                                <div class="mt-2 font-medium text-3xl leading-none">{{ disk.smart_results[0]?.temp }}°C</div>
+                                <div class="mt-2 font-medium text-3xl leading-none" *ngIf="disk.smart_results[0]; else unknownTemp">{{ disk.smart_results[0]?.temp }}°C</div>
+                                <ng-template #unknownTemp><div class="mt-2 font-medium text-3xl leading-none">--</div></ng-template>
                             </div>
                             <div class="flex flex-col mx-6 my-3 xs:w-full">
                                 <div class="font-semibold text-xs text-hint uppercase tracking-wider leading-none">Capacity</div>

webapp/frontend/src/app/modules/admin/detail/detail.component.html

@@ -83,6 +83,10 @@
                     <div>{{data.data.rotational_speed}} RPM</div>
                     <div class="text-secondary text-md">Rotation Rate</div>
                 </div>
+                <div *ngIf="data.data.device_protocol" class="my-2">
+                    <div>{{data.data.device_protocol}}</div>
+                    <div class="text-secondary text-md">Protocol</div>
+                </div>
                 <div class="my-2">
                     <div>{{data.data.smart_results[0]?.power_cycle_count}}</div>
                     <div class="text-secondary text-md">Power Cycle Count</div>
@@ -103,7 +107,7 @@
             <div class="flex flex-col flex-auto bg-card shadow-md rounded ">
                 <div class="p-6">
                     <div class="font-bold text-md text-secondary uppercase tracking-wider">S.M.A.R.T Attributes</div>
-                    <div class="text-sm text-hint font-medium">{{this.smartAttributeDataSource.data.length}} visible, {{this.data.data.smart_results[0]?.smart_attributes.length - this.smartAttributeDataSource.data.length}} hidden</div>
+                    <div class="text-sm text-hint font-medium">{{this.smartAttributeDataSource.data.length}} visible, {{this.data.data.smart_results[0]?.ata_attributes.length - this.smartAttributeDataSource.data.length}} hidden</div>
                 </div>
                 <div class="overflow-auto">
                     <table class="w-full bg-transparent"
@@ -169,7 +173,7 @@
                             </th>
                             <td mat-cell
                                 *matCellDef="let attribute">
-                                <span class="pr-6 whitespace-no-wrap" matTooltip="{{data.lookup[attribute.attribute_id]?.description}}">
+                                <span class="pr-6 whitespace-no-wrap" matTooltip="{{getAttributeDescription(attribute)}}">
                                     {{attribute.name}} <mat-icon class="icon-size-10" [svgIcon]="'info'"></mat-icon>
                                 </span>
                             </td>
@@ -187,8 +191,8 @@
                             </th>
                             <td mat-cell
                                 *matCellDef="let attribute">
-                                <span class="pr-6 whitespace-no-wrap" matTooltip="{{data.lookup[attribute.attribute_id].display_type}}">
+                                <span class="pr-6 whitespace-no-wrap" matTooltip="{{getAttributeValueType(attribute)}}">
-                                    {{extractAttributeValue(data.lookup[attribute.attribute_id], attribute)}}
+                                    {{getAttributeValue(attribute)}}
                                 </span>
                             </td>
                         </ng-container>
@@ -206,7 +210,7 @@
                             <td mat-cell
                                 *matCellDef="let attribute">
                                 <span class="pr-6 whitespace-no-wrap">
-                                    {{attribute.worst}}
+                                    {{getAttributeWorst(attribute)}}
                                 </span>
                             </td>
                         </ng-container>
@@ -224,7 +228,7 @@
                             <td mat-cell
                                 *matCellDef="let attribute">
                                 <span class="pr-6 whitespace-no-wrap">
-                                    {{attribute.thresh}}
+                                    {{getAttributeThreshold(attribute)}}
                                 </span>
                             </td>
                         </ng-container>
@@ -242,7 +246,7 @@
                             <td mat-cell
                                 *matCellDef="let attribute">
                                 <span class="pr-6 font-medium whitespace-no-wrap">
-                                    {{data.lookup[attribute.attribute_id]?.display_type == "raw" ? data.lookup[attribute.attribute_id]?.ideal : '' }}
+                                    {{getAttributeIdeal(attribute) }}
                                 </span>
                             </td>
                         </ng-container>

webapp/frontend/src/app/modules/admin/detail/detail.component.ts

@@ -93,8 +93,12 @@ export class DetailComponent implements OnInit, AfterViewInit, OnDestroy {
     // -----------------------------------------------------------------------------------------------------
     // @ Private methods
     // -----------------------------------------------------------------------------------------------------
+    getAttributeDescription(attribute_data){
+        return this.data.lookup[attribute_data.attribute_id]?.description
+    }
 
-    extractAttributeValue(attribute_metadata, attribute_data){
+    getAttributeValue(attribute_data){
+        let attribute_metadata = this.data.lookup[attribute_data.attribute_id]
         if(attribute_metadata.display_type == "raw"){
             return  attribute_data.raw_value
         }
@@ -105,6 +109,22 @@ export class DetailComponent implements OnInit, AfterViewInit, OnDestroy {
         }
     }
 
+    getAttributeValueType(attribute_data){
+        let attribute_metadata = this.data.lookup[attribute_data.attribute_id]
+        return this.data.lookup[attribute_data.attribute_id].display_type
+    }
+
+    getAttributeIdeal(attribute_data){
+        return this.data.lookup[attribute_data.attribute_id]?.display_type == "raw" ? this.data.lookup[attribute_data.attribute_id]?.ideal : ''
+    }
+
+    getAttributeWorst(attribute_data){
+        return attribute_data.worst
+    }
+    getAttributeThreshold(attribute_data){
+        return attribute_data.thresh
+    }
+
     private _generateSmartAttributeTableDataSource(smart_results){
         var smartAttributeDataSource = [];
 
@@ -113,14 +133,11 @@ export class DetailComponent implements OnInit, AfterViewInit, OnDestroy {
         }
 
         var latest_smart_result = smart_results[0];
-        for(let attr of latest_smart_result.smart_attributes){
+        for(let attr of latest_smart_result.ata_attributes){
-
-
-
             //chart history data
             if (!attr.chartData) {
-                var rawHistory = (attr.history || []).map(hist_attr => this.extractAttributeValue(this.data.lookup[attr.attribute_id], hist_attr)).reverse()
+                var rawHistory = (attr.history || []).map(hist_attr => this.getAttributeValue(hist_attr)).reverse()
-                rawHistory.push(this.extractAttributeValue(this.data.lookup[attr.attribute_id], attr))
+                rawHistory.push(this.getAttributeValue(attr))
                 attr.chartData = [
                     {
                         name: "chart-line-sparkline",
@@ -128,23 +145,6 @@ export class DetailComponent implements OnInit, AfterViewInit, OnDestroy {
                         data: rawHistory
                     }
                 ]
-
-                // //add the reference line showing the threshold
-                // attr.chartDataReferenceLine =  {
-                //     yaxis: [
-                //         {
-                //             y: attr.thresh,
-                //             borderColor: '#f05252',
-                //             label: {
-                //                 borderColor: '#f05252',
-                //                 style: {
-                //                     color: '#fff',
-                //                     background: '#f05252'
-                //                 },
-                //             }
-                //         }
-                //     ]
-                // }
             }
             //determine when to include the attributes in table.
             if(!this.onlyCritical || this.onlyCritical && this.data.lookup[attr.attribute_id]?.critical || attr.value <= attr.thresh){

webapp/frontend/src/app/shared/device-sort.pipe.spec.ts

@@ -0,0 +1,8 @@
+import { DeviceSortPipe } from './device-sort.pipe';
+
+describe('DeviceSortPipe', () => {
+  it('create an instance', () => {
+    const pipe = new DeviceSortPipe();
+    expect(pipe).toBeTruthy();
+  });
+});

webapp/frontend/src/app/shared/device-sort.pipe.ts

@@ -0,0 +1,33 @@
+import { Pipe, PipeTransform } from '@angular/core';
+
+@Pipe({
+  name: 'deviceSort'
+})
+export class DeviceSortPipe implements PipeTransform {
+
+    numericalStatus(device): number {
+        if(!device.smart_results[0]){
+            return 0
+        } else if (device.smart_results[0].smart_status == 'passed'){
+            return 1
+        } else {
+            return -1
+        }
+    }
+
+
+  transform(devices: Array<unknown>, ...args: unknown[]): Array<unknown> {
+      //failed, unknown/empty, passed
+      devices.sort((a: any, b: any) => {
+
+          let left = this.numericalStatus(a)
+          let right = this.numericalStatus(b)
+
+          return left - right;
+      });
+
+
+    return devices;
+  }
+
+}

webapp/frontend/src/app/shared/shared.module.ts

@@ -2,10 +2,12 @@ import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import {FileSizePipe} from "./file-size.pipe";
+import { DeviceSortPipe } from './device-sort.pipe';
 
 @NgModule({
     declarations: [
-        FileSizePipe
+        FileSizePipe,
+        DeviceSortPipe
     ],
     imports: [
         CommonModule,
@@ -16,7 +18,8 @@ import {FileSizePipe} from "./file-size.pipe";
         CommonModule,
         FormsModule,
         ReactiveFormsModule,
-        FileSizePipe
+        FileSizePipe,
+        DeviceSortPipe
     ]
 })
 export class SharedModule