From b866d8a73a35c90480daaad5d597d245c9cd27f8 Mon Sep 17 00:00:00 2001
From: darth-coder00 <86726556+darth-coder00@users.noreply.github.com>
Date: Thu, 6 Jan 2022 20:23:19 +0530
Subject: [PATCH] Fix: Search bar is searching in last active tab (#2081)

* Fix: Search bar is searching in last active tab

* Fix: Missing Sample data tab changes
---
 .../pages/explore/ExplorePage.component.tsx    |  4 ++++
 .../ui/src/utils/DatasetDetailsUtils.ts        | 18 ++++++++++--------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/explore/ExplorePage.component.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/explore/ExplorePage.component.tsx
index ae61d5ef886..7bb48241d37 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/explore/ExplorePage.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/explore/ExplorePage.component.tsx
@@ -200,6 +200,10 @@ const ExplorePage: FunctionComponent = () => {
     fetchCounts();
   }, [searchText]);
 
+  useEffect(() => {
+    AppState.explorePageTab = tab;
+  }, [tab]);
+
   useEffect(() => {
     fetchData([
       {
diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/DatasetDetailsUtils.ts b/openmetadata-ui/src/main/resources/ui/src/utils/DatasetDetailsUtils.ts
index 0f8c0e99f57..4017884c902 100644
--- a/openmetadata-ui/src/main/resources/ui/src/utils/DatasetDetailsUtils.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/utils/DatasetDetailsUtils.ts
@@ -16,6 +16,10 @@ export const datasetTableTabs = [
     name: 'Schema',
     path: 'schema',
   },
+  {
+    name: 'Sample Data',
+    path: 'sample_data',
+  },
   {
     name: 'Profiler',
     path: 'profiler',
@@ -28,10 +32,6 @@ export const datasetTableTabs = [
     name: 'DBT',
     path: 'dbt',
   },
-  {
-    name: 'Sample Data',
-    path: 'sample_data',
-  },
   {
     name: 'Manage',
     path: 'manage',
@@ -41,20 +41,22 @@ export const datasetTableTabs = [
 export const getCurrentDatasetTab = (tab: string) => {
   let currentTab = 1;
   switch (tab) {
-    case 'profiler':
+    case 'sample_data':
       currentTab = 2;
 
       break;
-    case 'lineage':
+
+    case 'profiler':
       currentTab = 3;
 
       break;
-    case 'dbt':
+
+    case 'lineage':
       currentTab = 4;
 
       break;
 
-    case 'sample_data':
+    case 'dbt':
       currentTab = 5;
 
       break;