From 0d232572ae9506bf629f198a16b9ea48dd07f87d Mon Sep 17 00:00:00 2001
From: Alex Shorsher <alex.shorsher@kaleido.io>
Date: Tue, 23 Nov 2021 13:53:08 -0500
Subject: [PATCH] use replaceIn param when setting query parameters

Prevents multiple history states from being pushed onto the stack when
visiting a view without `time`, `view`, or `filter` params already set
in the URL.

 - version 0.4.2

Signed-off-by: Alex Shorsher <alex.shorsher@kaleido.io>
---
 package.json                                         | 4 ++--
 src/core/components/DataViewSwitch.tsx               | 2 +-
 src/core/components/DatePicker.tsx                   | 2 +-
 src/modules/data/views/Data/Data.tsx                 | 2 +-
 src/modules/data/views/Messages/Messages.tsx         | 2 +-
 src/modules/data/views/Transactions/Transactions.tsx | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index 426b0a1c..d2176771 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "firefly-ui",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "private": true,
   "dependencies": {
     "@emotion/react": "^11.4.1",
@@ -73,4 +73,4 @@
     "prettier": "^2.2.1"
   },
   "proxy": "http://localhost:5000"
-}
\ No newline at end of file
+}
diff --git a/src/core/components/DataViewSwitch.tsx b/src/core/components/DataViewSwitch.tsx
index 989c8b2e..c7282ebc 100644
--- a/src/core/components/DataViewSwitch.tsx
+++ b/src/core/components/DataViewSwitch.tsx
@@ -36,7 +36,7 @@ export const DataViewSwitch: React.FC = () => {
     }
 
     // use view from state and update the url
-    setView(dataView);
+    setView(dataView, 'replaceIn');
   }, [view, setView, setDataView, dataView]);
 
   return (
diff --git a/src/core/components/DatePicker.tsx b/src/core/components/DatePicker.tsx
index 2336937e..47ec64fc 100644
--- a/src/core/components/DatePicker.tsx
+++ b/src/core/components/DatePicker.tsx
@@ -52,7 +52,7 @@ export const DatePicker: React.FC = () => {
     }
 
     // use time from state and update the url
-    setTime(createdFilter);
+    setTime(createdFilter, 'replaceIn');
   }, [time, setTime, setCreatedFilter, createdQueryOptions, createdFilter]);
 
   return (
diff --git a/src/modules/data/views/Data/Data.tsx b/src/modules/data/views/Data/Data.tsx
index 2bd0feca..6c104401 100644
--- a/src/modules/data/views/Data/Data.tsx
+++ b/src/modules/data/views/Data/Data.tsx
@@ -69,7 +69,7 @@ export const Data: () => JSX.Element = () => {
 
   useEffect(() => {
     //set query param state
-    setFilterQuery(activeFilters);
+    setFilterQuery(activeFilters, 'replaceIn');
     if (activeFilters.length === 0) {
       setFilterString('');
       return;
diff --git a/src/modules/data/views/Messages/Messages.tsx b/src/modules/data/views/Messages/Messages.tsx
index 4ad5fbc2..bb321bf2 100644
--- a/src/modules/data/views/Messages/Messages.tsx
+++ b/src/modules/data/views/Messages/Messages.tsx
@@ -71,7 +71,7 @@ export const Messages: () => JSX.Element = () => {
 
   useEffect(() => {
     //set query param state
-    setFilterQuery(activeFilters);
+    setFilterQuery(activeFilters, 'replaceIn');
     if (activeFilters.length === 0) {
       setFilterString('');
       return;
diff --git a/src/modules/data/views/Transactions/Transactions.tsx b/src/modules/data/views/Transactions/Transactions.tsx
index 16c8b95b..4636fd71 100644
--- a/src/modules/data/views/Transactions/Transactions.tsx
+++ b/src/modules/data/views/Transactions/Transactions.tsx
@@ -72,7 +72,7 @@ export const Transactions: () => JSX.Element = () => {
 
   useEffect(() => {
     //set query param state
-    setFilterQuery(activeFilters);
+    setFilterQuery(activeFilters, 'replaceIn');
     if (activeFilters.length === 0) {
       setFilterString('');
       return;