From 7b10e8121726d993416e95c7b56e89027becd06d Mon Sep 17 00:00:00 2001
From: Quan Nguyen <86090707+qu8n@users.noreply.github.com>
Date: Tue, 27 Aug 2024 12:23:32 -0400
Subject: [PATCH] Fix user search and WES sample tab view not working together

---
 graphql-server/src/utils/oncotree.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/graphql-server/src/utils/oncotree.ts b/graphql-server/src/utils/oncotree.ts
index 983d91b0..fd76b897 100644
--- a/graphql-server/src/utils/oncotree.ts
+++ b/graphql-server/src/utils/oncotree.ts
@@ -127,11 +127,11 @@ export function includeCancerTypeFieldsInSearch(
   //    ...
   // ]
   const sampleMetadataFilters =
-    // Request Samples view handler
-    customWhere?.hasMetadataSampleMetadata_SOME?.OR ||
     // Other views handler
     customWhere?.OR?.find((filter) => filter.hasMetadataSampleMetadata_SOME)
-      ?.hasMetadataSampleMetadata_SOME?.OR;
+      ?.hasMetadataSampleMetadata_SOME?.OR ||
+    // Request Samples view handler
+    customWhere?.hasMetadataSampleMetadata_SOME?.OR;
 
   if (sampleMetadataFilters?.length) {
     // Extract the user query: searchValues equal ["someValue"] for a single-value search