1 files changed, 36 insertions, 52 deletions
diff --git a/src/store/modules/HardwareStatus/SensorsStore.js b/src/store/modules/HardwareStatus/SensorsStore.js
index 59872718..1e57158b 100644
--- a/src/store/modules/HardwareStatus/SensorsStore.js
+++ b/src/store/modules/HardwareStatus/SensorsStore.js
@@ -95,63 +95,47 @@ const SensorsStore = {
         })
       );
     },
-    async getOnlyTempSensors({ commit }, id) {
-      const sensors = await api
-        .get(`${id}/Sensors`)
-        .then((response) => response.data.Members)
-        .catch((error) => console.log(error));
-      const tempSensors = sensors.filter((sensor) => {
-        return sensor['@odata.id'].toLowerCase().includes('temp');
-      });
-      if (!tempSensors) return;
-      const promises = tempSensors.map((sensor) => {
-        return api.get(sensor['@odata.id']).catch((error) => {
-          console.log(error);
-          return error;
-        });
-      });
-      return await api.all(promises).then(
-        api.spread((...responses) => {
-          const sensorData = responses.map(({ data }) => {
-            return {
-              name: data.Name,
-              status: data.Status.Health,
-              currentValue: data.Reading,
-              units: data.ReadingUnits,
-            };
+    async getOnlyFanSensors({ commit }, id) {
+      return await api
+        .get(`${id}/Thermal`)
+        .then(({ data: { Fans = [] } }) => {
+          const sensorData = [];
+          Fans.forEach((sensor) => {
+            sensorData.push({
+              name: sensor.Name,
+              status: sensor.Status.Health,
+              currentValue: sensor.Reading,
+              lowerCaution: sensor.LowerThresholdNonCritical,
+              upperCaution: sensor.UpperThresholdNonCritical,
+              lowerCritical: sensor.LowerThresholdCritical,
+              upperCritical: sensor.UpperThresholdCritical,
+              units: sensor.ReadingUnits,
+            });
           });
-          commit('setTempSensors', sensorData);
+          commit('setFanSensors', sensorData);
         })
-      );
-    },
-    async getOnlyFanSensors({ commit }, id) {
-      const sensors = await api
-        .get(`${id}/Sensors`)
-        .then((response) => response.data.Members)
         .catch((error) => console.log(error));
-      const fanSensors = sensors.filter((sensor) => {
-        return sensor['@odata.id'].toLowerCase().includes('fan');
-      });
-      if (!fanSensors) return;
-      const promises = fanSensors.map((sensor) => {
-        return api.get(sensor['@odata.id']).catch((error) => {
-          console.log(error);
-          return error;
-        });
-      });
-      return await api.all(promises).then(
-        api.spread((...responses) => {
-          const sensorData = responses.map(({ data }) => {
-            return {
-              name: data.Name,
-              status: data.Status.Health,
-              currentValue: data.Reading,
-              units: data.ReadingUnits,
-            };
+    },
+    async getOnlyTempSensors({ commit }, id) {
+      return await api
+        .get(`${id}/Thermal`)
+        .then(({ data: { Temperatures = [] } }) => {
+          const sensorData = [];
+          Temperatures.forEach((sensor) => {
+            sensorData.push({
+              name: sensor.Name,
+              status: sensor.Status.Health,
+              currentValue: sensor.ReadingCelsius,
+              lowerCaution: sensor.LowerThresholdNonCritical,
+              upperCaution: sensor.UpperThresholdNonCritical,
+              lowerCritical: sensor.LowerThresholdCritical,
+              upperCritical: sensor.UpperThresholdCritical,
+              units: '℃',
+            });
           });
-          commit('setFanSensors', sensorData);
+          commit('setTempSensors', sensorData);
         })
-      );
+        .catch((error) => console.log(error));
     },
     async getThermalSensors({ commit }, id) {
       return await api