From 35c81ce1125b3cf4e08390e81e5e8b5e72b005a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9rgio=20Salgado?= <sergiodiassalgado@gmail.com>
Date: Thu, 10 Feb 2022 18:09:39 +0000
Subject: [PATCH] fix: analytics graph memoizing

---
 .../src/components/inputs/base/Select.styles.js          | 2 +-
 .../src/pages/Analytics/graphs/HourOfDayBarGraph.js      | 6 ++++--
 .../src/pages/Analytics/graphs/TopMachinesBarGraph.js    | 9 +++++++--
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/new-lamassu-admin/src/components/inputs/base/Select.styles.js b/new-lamassu-admin/src/components/inputs/base/Select.styles.js
index 0d4b426c..aebce882 100644
--- a/new-lamassu-admin/src/components/inputs/base/Select.styles.js
+++ b/new-lamassu-admin/src/components/inputs/base/Select.styles.js
@@ -14,7 +14,7 @@ export default {
   },
   select: {
     width: WIDTH,
-    zIndex: 2,
+    zIndex: 1,
     '& label': {
       extend: label1,
       color: offColor,
diff --git a/new-lamassu-admin/src/pages/Analytics/graphs/HourOfDayBarGraph.js b/new-lamassu-admin/src/pages/Analytics/graphs/HourOfDayBarGraph.js
index eb61f70c..6f7736be 100644
--- a/new-lamassu-admin/src/pages/Analytics/graphs/HourOfDayBarGraph.js
+++ b/new-lamassu-admin/src/pages/Analytics/graphs/HourOfDayBarGraph.js
@@ -21,7 +21,8 @@ const Graph = ({
   timezone,
   setSelectionCoords,
   setSelectionData,
-  setSelectionDateInterval
+  setSelectionDateInterval,
+  selectedMachine
 }) => {
   const ref = useRef(null)
 
@@ -428,5 +429,6 @@ export default memo(
   Graph,
   (prev, next) =>
     R.equals(prev.period, next.period) &&
-    R.equals(prev.selectedDay, next.selectedDay)
+    R.equals(prev.selectedDay, next.selectedDay) &&
+    R.equals(prev.selectedMachine, next.selectedMachine)
 )
diff --git a/new-lamassu-admin/src/pages/Analytics/graphs/TopMachinesBarGraph.js b/new-lamassu-admin/src/pages/Analytics/graphs/TopMachinesBarGraph.js
index 47d794af..0d9fad1d 100644
--- a/new-lamassu-admin/src/pages/Analytics/graphs/TopMachinesBarGraph.js
+++ b/new-lamassu-admin/src/pages/Analytics/graphs/TopMachinesBarGraph.js
@@ -11,7 +11,7 @@ import {
   fontSecondary
 } from 'src/styling/variables'
 
-const Graph = ({ data, machines, currency }) => {
+const Graph = ({ data, machines, currency, selectedMachine }) => {
   const ref = useRef(null)
 
   const AMOUNT_OF_MACHINES = 5
@@ -304,4 +304,9 @@ const Graph = ({ data, machines, currency }) => {
   return <svg ref={ref} />
 }
 
-export default memo(Graph, (prev, next) => R.equals(prev.period, next.period))
+export default memo(
+  Graph,
+  (prev, next) =>
+    R.equals(prev.period, next.period) &&
+    R.equals(prev.selectedMachine, next.selectedMachine)
+)