From 6cce257014724b0592729e0ef8e901845bed47d2 Mon Sep 17 00:00:00 2001
From: Ray Arvin Rimorin <ray@fbmsoftware.com>
Date: Thu, 25 May 2023 13:14:28 +0800
Subject: [PATCH 1/2] ZI-13898

when using GUID for fingerprinting, ignore fingerprintjs
---
 src/components/Fingerprint/Fingerprint.jsx          | 10 +++++++---
 src/components/VirtuosoDataGrid/DataGridToolbar.jsx |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/components/Fingerprint/Fingerprint.jsx b/src/components/Fingerprint/Fingerprint.jsx
index bea3841..84d1c88 100644
--- a/src/components/Fingerprint/Fingerprint.jsx
+++ b/src/components/Fingerprint/Fingerprint.jsx
@@ -12,13 +12,13 @@ const useStyles = makeStyles()((theme) => {
 let fpPromise = null
 
 const registerFingerprint = async () => {
-  fpPromise = FingerprintJS.load({
-    monitoring: false,
-  })
   const fp = await localStorage.getItem('fingerprint')
   if (isEmpty(fp)) {
     await localStorage.setItem('fingerprint', uuidv4())
   }
+  fpPromise = FingerprintJS.load({
+    monitoring: false,
+  })
 }
 
 const useFingerprint = async () => {
@@ -40,6 +40,10 @@ const Fingerprint = ({ guid=false, onFingerprint = () => { } }) => {
   const { classes } = useStyles()
 
   useEffect(() => {
+    if (guid) {
+      onFingerprint(localStorage.getItem('fingerprint'))
+      return
+    }
     if (!fpPromise) throw new Error('FingerprintJS not loaded, add registerFingerprint() closest to root as possible (possibly index.js)')
     const fetchFP = async () => {
       const fp = await fpPromise
diff --git a/src/components/VirtuosoDataGrid/DataGridToolbar.jsx b/src/components/VirtuosoDataGrid/DataGridToolbar.jsx
index 1693147..f6f010e 100644
--- a/src/components/VirtuosoDataGrid/DataGridToolbar.jsx
+++ b/src/components/VirtuosoDataGrid/DataGridToolbar.jsx
@@ -236,7 +236,7 @@ const DataGridToolbar = ({
           )}
         </Box>
         {tableInstanceRef.current && (
-          <Box sx={{ paddingLeft: 2, minWidth: '250px', width: '250px', display: 'flex', flexDirection: 'row' }}>
+          <Box sx={{ paddingLeft: 2, minWidth: '250px', width: '250px', display: 'flex', flexDirection: 'row', justifyContent:'flex-end' }}>
             <MRT_GlobalFilterTextField table={tableInstanceRef.current} />
             {/* <MRT_ToggleFiltersButton table={tableInstanceRef.current} /> */}
             <MRT_ShowHideColumnsButton table={tableInstanceRef.current} />

From 3399499e9533fd3ca9df7531038bfb3120d06231 Mon Sep 17 00:00:00 2001
From: Ray Arvin Rimorin <ray@fbmsoftware.com>
Date: Thu, 25 May 2023 13:18:10 +0800
Subject: [PATCH 2/2] ZI-13898

remove unrelated code
---
 src/components/VirtuosoDataGrid/DataGridToolbar.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/VirtuosoDataGrid/DataGridToolbar.jsx b/src/components/VirtuosoDataGrid/DataGridToolbar.jsx
index f6f010e..1693147 100644
--- a/src/components/VirtuosoDataGrid/DataGridToolbar.jsx
+++ b/src/components/VirtuosoDataGrid/DataGridToolbar.jsx
@@ -236,7 +236,7 @@ const DataGridToolbar = ({
           )}
         </Box>
         {tableInstanceRef.current && (
-          <Box sx={{ paddingLeft: 2, minWidth: '250px', width: '250px', display: 'flex', flexDirection: 'row', justifyContent:'flex-end' }}>
+          <Box sx={{ paddingLeft: 2, minWidth: '250px', width: '250px', display: 'flex', flexDirection: 'row' }}>
             <MRT_GlobalFilterTextField table={tableInstanceRef.current} />
             {/* <MRT_ToggleFiltersButton table={tableInstanceRef.current} /> */}
             <MRT_ShowHideColumnsButton table={tableInstanceRef.current} />