Merge pull request #79 from kaleido-io/fix-browser-back

use replaceIn param when setting query parameters
hyperledger · Nov 23, 2021 · 8351002 · 8351002
2 parents 54a9605 + 0d23257
commit 8351002
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git 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"
-}
+}
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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;