upd store logic, dynamic

9 files changed, 77 insertions, 21 deletions

diff --git a/src/store/modules/HardwareStatus/MemoryStore.js b/src/store/modules/HardwareStatus/MemoryStore.js
index fc3e4309..358ca725 100644
--- a/src/store/modules/HardwareStatus/MemoryStore.js
+++ b/src/store/modules/HardwareStatus/MemoryStore.js
@@ -5,9 +5,11 @@ const MemoryStore = {
   namespaced: true,
   state: {
     dimms: [],
+    dimmsLastHour: [],
   },
   getters: {
     dimms: (state) => state.dimms,
+    dimmsLastHour: (state) => state.dimmsLastHour,
   },
   mutations: {
     setMemoryInfo: (state, data) => {
@@ -56,6 +58,10 @@ const MemoryStore = {
     setMemoryDynamic: (state, data) => {
       state.dimms = data;
     },
+
+    setMemoryDynamicLastHour: (state, data) => {
+      state.dimmsLastHour = data;
+    },
   },
   actions: {
     async getMemoryDynamic({ commit }, { lastHour }) {
@@ -69,9 +75,13 @@ const MemoryStore = {
       }
       return await api
         .get(url)
-        .then(({ data: { MetricValues = [] } }) =>
-          commit('setMemoryDynamic', MetricValues)
-        )
+        .then(({ data: { MetricValues = [] } }) => {
+          if (lastHour) {
+            commit('setMemoryDynamicLastHour', MetricValues);
+          } else {
+            commit('setMemoryDynamic', MetricValues);
+          }
+        })
         .catch((error) => console.log(error));
     },
     async getDimms({ commit }) {
diff --git a/src/store/modules/HardwareStatus/ProcessorStore.js b/src/store/modules/HardwareStatus/ProcessorStore.js
index ddf9db4a..5466b85e 100644
--- a/src/store/modules/HardwareStatus/ProcessorStore.js
+++ b/src/store/modules/HardwareStatus/ProcessorStore.js
@@ -6,10 +6,14 @@ const ProcessorStore = {
   state: {
     cpuTemp: [],
     cpuPower: [],
+    cpuTempLastHour: [],
+    cpuPowerLastHour: [],
   },
   getters: {
     cpuTemp: (state) => state.cpuTemp,
     cpuPower: (state) => state.cpuPower,
+    cpuTempLastHour: (state) => state.cpuTempLastHour,
+    cpuPowerLastHour: (state) => state.cpuPowerLastHour,
   },
   mutations: {
     setProcessorsInfo: (state, data) => {
@@ -62,12 +66,18 @@ const ProcessorStore = {
       });
     },
 
-    setProcessorsDynamic: (state, data) => {
+    setCpuTempDynamic: (state, data) => {
       state.cpuTemp = data;
     },
     setCpuPowerDynamic: (state, data) => {
       state.cpuPower = data;
     },
+    setCpuTempDynamicLastHour: (state, data) => {
+      state.cpuTempLastHour = data;
+    },
+    setCpuPowerDynamicLastHour: (state, data) => {
+      state.cpuPowerLastHour = data;
+    },
   },
   actions: {
     async getCpuPowerDynamic({ commit }, { lastHour }) {
@@ -80,9 +90,13 @@ const ProcessorStore = {
       }
       return await api
         .get(url)
-        .then(({ data: { MetricValues = [] } }) =>
-          commit('setCpuPowerDynamic', MetricValues)
-        )
+        .then(({ data: { MetricValues = [] } }) => {
+          if (lastHour) {
+            commit('setCpuPowerDynamicLastHour', MetricValues);
+          } else {
+            commit('setCpuPowerDynamic', MetricValues);
+          }
+        })
         .catch((error) => console.log(error));
     },
     async getCpuTempDynamic({ commit }, { lastHour }) {
@@ -96,9 +110,13 @@ const ProcessorStore = {
       }
       return await api
         .get(url)
-        .then(({ data: { MetricValues = [] } }) =>
-          commit('setProcessorsDynamic', MetricValues)
-        )
+        .then(({ data: { MetricValues = [] } }) => {
+          if (lastHour) {
+            commit('setCpuTempDynamicLastHour', MetricValues);
+          } else {
+            commit('setCpuTempDynamic', MetricValues);
+          }
+        })
         .catch((error) => console.log(error));
     },
     async getProcessorsInfo({ commit }) {
diff --git a/src/store/modules/_sila/HardwareStatus/FanStore.js b/src/store/modules/_sila/HardwareStatus/FanStore.js
index d0804b80..fed3f742 100644
--- a/src/store/modules/_sila/HardwareStatus/FanStore.js
+++ b/src/store/modules/_sila/HardwareStatus/FanStore.js
@@ -5,9 +5,11 @@ const FanStore = {
   namespaced: true,
   state: {
     fans: [],
+    fansLastHour: [],
   },
   getters: {
     fans: (state) => state.fans,
+    fansLastHour: (state) => state.fansLastHour,
   },
   mutations: {
     setFanInfo: (state, data) => {
@@ -43,6 +45,9 @@ const FanStore = {
     setFansDynamic: (state, data) => {
       state.fans = data;
     },
+    setFansDynamicLastHour: (state, data) => {
+      state.fansLastHour = data;
+    },
   },
   actions: {
     async getFansDynamic({ commit }, { lastHour }) {
@@ -55,9 +60,13 @@ const FanStore = {
       }
       return await api
         .get(url)
-        .then(({ data: { MetricValues = [] } }) =>
-          commit('setFansDynamic', MetricValues)
-        )
+        .then(({ data: { MetricValues = [] } }) => {
+          if (lastHour) {
+            commit('setFansDynamicLastHour', MetricValues);
+          } else {
+            commit('setFansDynamic', MetricValues);
+          }
+        })
         .catch((error) => console.log(error));
     },
     async getFanInfo({ commit }) {
diff --git a/src/store/modules/_sila/HardwareStatus/MotherboardStore.js b/src/store/modules/_sila/HardwareStatus/MotherboardStore.js
index 1099b4a7..7b2fe032 100644
--- a/src/store/modules/_sila/HardwareStatus/MotherboardStore.js
+++ b/src/store/modules/_sila/HardwareStatus/MotherboardStore.js
@@ -4,14 +4,19 @@ const MotherboardStore = {
   namespaced: true,
   state: {
     motherboard: [],
+    motherboardLastHour: [],
   },
   getters: {
     motherboard: (state) => state.motherboard,
+    motherboardLastHour: (state) => state.motherboardLastHour,
   },
   mutations: {
     setMotherboardDynamic: (state, data) => {
       state.motherboard = data;
     },
+    setMotherboardDynamicLastHour: (state, data) => {
+      state.motherboardLastHour = data;
+    },
   },
   actions: {
     async getMotherboardDynamic({ commit }, { lastHour }) {
@@ -25,9 +30,13 @@ const MotherboardStore = {
       }
       return await api
         .get(url)
-        .then(({ data: { MetricValues = [] } }) =>
-          commit('setMotherboardDynamic', MetricValues)
-        )
+        .then(({ data: { MetricValues = [] } }) => {
+          if (lastHour) {
+            commit('setMotherboardDynamicLastHour', MetricValues);
+          } else {
+            commit('setMotherboardDynamic', MetricValues);
+          }
+        })
         .catch((error) => console.log(error));
     },
   },
diff --git a/src/views/_sila/Fans/Dynamic/FanSpeed.vue b/src/views/_sila/Fans/Dynamic/FanSpeed.vue
index ba6e6c82..b119c268 100644
--- a/src/views/_sila/Fans/Dynamic/FanSpeed.vue
+++ b/src/views/_sila/Fans/Dynamic/FanSpeed.vue
@@ -133,7 +133,9 @@ export default {
     },
 
     allSensors() {
-      return this.$store.getters['fan/fans'];
+      return this.timeScale === 'hour'
+        ? this.$store.getters['fan/fansLastHour']
+        : this.$store.getters['fan/fans'];
     },
 
     filteredSensors() {
diff --git a/src/views/_sila/Memory/Dynamic/MemoryTemp.vue b/src/views/_sila/Memory/Dynamic/MemoryTemp.vue
index b3278909..695006ba 100644
--- a/src/views/_sila/Memory/Dynamic/MemoryTemp.vue
+++ b/src/views/_sila/Memory/Dynamic/MemoryTemp.vue
@@ -152,7 +152,9 @@ export default {
     },
 
     allSensors() {
-      return this.$store.getters['memory/dimms'];
+      return this.timeScale === 'hour'
+        ? this.$store.getters['memory/dimmsLastHour']
+        : this.$store.getters['memory/dimms'];
     },
 
     filteredSensors() {
diff --git a/src/views/_sila/Motherboard/Dynamic/MotherboardTemp.vue b/src/views/_sila/Motherboard/Dynamic/MotherboardTemp.vue
index f0dd97e7..35355edb 100644
--- a/src/views/_sila/Motherboard/Dynamic/MotherboardTemp.vue
+++ b/src/views/_sila/Motherboard/Dynamic/MotherboardTemp.vue
@@ -127,7 +127,9 @@ export default {
     },
 
     allSensors() {
-      return this.$store.getters['motherboard/motherboard'];
+      return this.timeScale === 'hour'
+        ? this.$store.getters['motherboard/motherboardLastHour']
+        : this.$store.getters['motherboard/motherboard'];
     },
 
     filteredSensors() {
diff --git a/src/views/_sila/Processors/Dynamic/CpuPower.vue b/src/views/_sila/Processors/Dynamic/CpuPower.vue
index 8e03b3d7..a5a2a98f 100644
--- a/src/views/_sila/Processors/Dynamic/CpuPower.vue
+++ b/src/views/_sila/Processors/Dynamic/CpuPower.vue
@@ -120,7 +120,9 @@ export default {
     },
 
     allSensors() {
-      return this.$store.getters['processors/cpuPower'];
+      return this.timeScale === 'hour'
+        ? this.$store.getters['processors/cpuPowerLastHour']
+        : this.$store.getters['processors/cpuPower'];
     },
 
     filteredSensors() {
diff --git a/src/views/_sila/Processors/Dynamic/CpuTemp.vue b/src/views/_sila/Processors/Dynamic/CpuTemp.vue
index 2f69a5a5..1da00e70 100644
--- a/src/views/_sila/Processors/Dynamic/CpuTemp.vue
+++ b/src/views/_sila/Processors/Dynamic/CpuTemp.vue
@@ -148,7 +148,9 @@ export default {
     },
 
     allSensors() {
-      return this.$store.getters['processors/cpuTemp'];
+      return this.timeScale === 'hour'
+        ? this.$store.getters['processors/cpuTempLastHour']
+        : this.$store.getters['processors/cpuTemp'];
     },
 
     filteredSensors() {