From d28b04b39e997853315626a40c7526f8fe77c040 Mon Sep 17 00:00:00 2001
From: Daniel <daniel-blyth@live.com.au>
Date: Sun, 1 Jun 2025 19:24:20 +1000
Subject: [PATCH 1/2] Update Browser.react.js

---
 src/dashboard/Data/Browser/Browser.react.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/dashboard/Data/Browser/Browser.react.js b/src/dashboard/Data/Browser/Browser.react.js
index 9ec624719c..66bfcb6f51 100644
--- a/src/dashboard/Data/Browser/Browser.react.js
+++ b/src/dashboard/Data/Browser/Browser.react.js
@@ -54,6 +54,7 @@ class Browser extends DashboardView {
     this.section = 'Core';
     this.subsection = 'Browser';
     this.noteTimeout = null;
+    this.currentQuery = null; // Track current query
     const limit = window.localStorage?.getItem('browserLimit');
 
     this.state = {
@@ -221,6 +222,9 @@ class Browser extends DashboardView {
   }
 
   componentWillUnmount() {
+    if (this.currentQuery) {
+      this.currentQuery.cancel();
+    }
     this.removeLocation();
     window.removeEventListener('mouseup', this.onMouseUpRowCheckBox);
   }
@@ -897,6 +901,10 @@ class Browser extends DashboardView {
   }
 
   async fetchParseData(source, filters) {
+    if (this.currentQuery) {
+      this.currentQuery.cancel();
+    }
+
     const { useMasterKey, skip, limit } = this.state;
     this.setState({
       data: null,
@@ -916,6 +924,7 @@ class Browser extends DashboardView {
     localStorage?.setItem('browserLimit', limit);
 
     this.excludeFields(query, source);
+    this.currentQuery = query;
     let promise = query.find({ useMasterKey });
     let isUnique = false;
     let uniqueField = null;

From 7f6d7bce265b7309811705858cf9f08f4508f111 Mon Sep 17 00:00:00 2001
From: Daniel <daniel-blyth@live.com.au>
Date: Sun, 1 Jun 2025 19:27:52 +1000
Subject: [PATCH 2/2] Update Browser.react.js

---
 src/dashboard/Data/Browser/Browser.react.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/dashboard/Data/Browser/Browser.react.js b/src/dashboard/Data/Browser/Browser.react.js
index 66bfcb6f51..c61d216b29 100644
--- a/src/dashboard/Data/Browser/Browser.react.js
+++ b/src/dashboard/Data/Browser/Browser.react.js
@@ -54,7 +54,7 @@ class Browser extends DashboardView {
     this.section = 'Core';
     this.subsection = 'Browser';
     this.noteTimeout = null;
-    this.currentQuery = null; // Track current query
+    this.currentQuery = null;
     const limit = window.localStorage?.getItem('browserLimit');
 
     this.state = {