change more stuff

dgidb · Oct 24, 2024 · 7343f00 · 7343f00
1 parent e9af8a8
commit 7343f00
Show file tree

Hide file tree

Showing 15 changed files with 53 additions and 100 deletions.
diff --git a/client/src/config/index.ts b/client/src/config/index.ts
@@ -1,4 +1,6 @@
 import { GraphQLClient } from 'graphql-request';
 
 export const API_URL = process.env.REACT_APP_API_URI;
-export const graphQLClient = new GraphQLClient(API_URL!);
+export const graphQLClient = new GraphQLClient(API_URL!, {
+  headers: { 'dgidb-client-name': 'dgidb-frontend' },
+});
diff --git a/client/src/hooks/queries/useGetAmbiguousResults.ts b/client/src/hooks/queries/useGetAmbiguousResults.ts
@@ -114,10 +114,11 @@ export function useGetMatchedResults(names: string[], type: ResultTypes) {
     async () => {
       const res = await graphQLClient.request(
         requestQuery,
+        { searchTerms: names },
         {
-          searchTerms: names,
-        },
-        { 'dgidb-client-name': 'dgidb-frontend' }
+          'dgidb-query-type':
+            type === ResultTypes.Gene ? 'search-genes' : 'search-drugs',
+        }
       );
       return res;
     },

diff --git a/client/src/hooks/queries/useGetCategories.ts b/client/src/hooks/queries/useGetCategories.ts
@@ -40,10 +40,11 @@ export function useGetCategories(names: string[]) {
     async () => {
       const res = await graphQLClient.request(
         getCategoriesQuery,
+        { searchTerms: names },
         {
-          searchTerms: names,
-        },
-        { 'dgidb-client-name': 'dgidb-frontend' }
+          'dgidb-query-type': 'search-genes',
+          'dgidb-genes-search-mode': 'categories',
+        }
       );
       return res;
     },

diff --git a/client/src/hooks/queries/useGetDrugInteractions.ts b/client/src/hooks/queries/useGetDrugInteractions.ts
@@ -33,13 +33,9 @@ export function useGetDrugInteractions(conceptId: string) {
   return useQuery(
     'drug-interactions' + conceptId,
     async () => {
-      const res = await graphQLClient.request(
-        getDrugInteractionsQuery,
-        {
-          conceptId,
-        },
-        { 'dgidb-client-name': 'dgidb-frontend' }
-      );
+      const res = await graphQLClient.request(getDrugInteractionsQuery, {
+        conceptId,
+      });
       return res;
     },
     { enabled: conceptId !== '' }

diff --git a/client/src/hooks/queries/useGetDrugRecord.ts b/client/src/hooks/queries/useGetDrugRecord.ts
@@ -31,13 +31,9 @@ export function useGetDrugRecord(conceptId: string) {
   return useQuery(
     'drug-record' + conceptId,
     async () => {
-      const res = await graphQLClient.request(
-        getDrugRecordQuery,
-        {
-          conceptId,
-        },
-        { 'dgidb-client-name': 'dgidb-frontend' }
-      );
+      const res = await graphQLClient.request(getDrugRecordQuery, {
+        conceptId,
+      });
       return res;
     },
     { enabled: conceptId !== '' }

diff --git a/client/src/hooks/queries/useGetDruggableSources.ts b/client/src/hooks/queries/useGetDruggableSources.ts
@@ -41,13 +41,9 @@ export function useGetDruggableSources(sourceType: string) {
   return useQuery(
     'druggable-sources' + sourceType,
     async () => {
-      const res = await graphQLClient.request(
-        getDruggableSourcesQuery,
-        {
-          sourceType,
-        },
-        { 'dgidb-client-name': 'dgidb-frontend' }
-      );
+      const res = await graphQLClient.request(getDruggableSourcesQuery, {
+        sourceType,
+      });
       return res;
     },
     { enabled: sourceType !== '' }
@@ -85,13 +81,9 @@ export function useGetGeneSources(sourceType: string) {
   return useQuery(
     'gene-sources' + sourceType,
     async () => {
-      const res = await graphQLClient.request(
-        getGeneSourcesQuery,
-        {
-          sourceType,
-        },
-        { 'dgidb-client-name': 'dgidb-frontend' }
-      );
+      const res = await graphQLClient.request(getGeneSourcesQuery, {
+        sourceType,
+      });
       return res;
     },
     { enabled: sourceType !== '' }
@@ -129,13 +121,9 @@ export function useGetDrugSources(sourceType: string) {
   return useQuery(
     'drug-sources' + sourceType,
     async () => {
-      const res = await graphQLClient.request(
-        getDrugSourcesQuery,
-        {
-          sourceType,
-        },
-        { 'dgidb-client-name': 'dgidb-frontend' }
-      );
+      const res = await graphQLClient.request(getDrugSourcesQuery, {
+        sourceType,
+      });
       return res;
     },
     { enabled: sourceType !== '' }
@@ -177,13 +165,9 @@ export function useGetInteractionSources(sourceType: string) {
   return useQuery(
     'interaction-sources' + sourceType,
     async () => {
-      const res = await graphQLClient.request(
-        getInteractionSourcesQuery,
-        {
-          sourceType,
-        },
-        { 'dgidb-client-name': 'dgidb-frontend' }
-      );
+      const res = await graphQLClient.request(getInteractionSourcesQuery, {
+        sourceType,
+      });
       return res;
     },
     { enabled: sourceType !== '' }

diff --git a/client/src/hooks/queries/useGetGeneCountsForCategories.ts b/client/src/hooks/queries/useGetGeneCountsForCategories.ts
@@ -17,13 +17,9 @@ export const useGetGeneCountsForCategories = (sourceDbNames: String[]) => {
   return useQuery(
     'gene-counts-for-categories',
     async () => {
-      const res = await graphQLClient.request(
-        getGeneCountsForCategoriesQuery,
-        {
-          sourceDbNames: sourceDbNames,
-        },
-        { 'dgidb-client-name': 'dgidb-frontend' }
-      );
+      const res = await graphQLClient.request(getGeneCountsForCategoriesQuery, {
+        sourceDbNames: sourceDbNames,
+      });
       return res;
     },
     { enabled: true } // TODO double check

diff --git a/client/src/hooks/queries/useGetGeneInteractions.ts b/client/src/hooks/queries/useGetGeneInteractions.ts
@@ -33,13 +33,9 @@ export function useGetGeneInteractions(conceptId: string) {
   return useQuery(
     'gene-interactions' + conceptId,
     async () => {
-      const res = await graphQLClient.request(
-        getGeneInteractionsQuery,
-        {
-          conceptId,
-        },
-        { 'dgidb-client-name': 'dgidb-frontend' }
-      );
+      const res = await graphQLClient.request(getGeneInteractionsQuery, {
+        conceptId,
+      });
       return res;
     },
     { enabled: conceptId !== '' }

diff --git a/client/src/hooks/queries/useGetGeneRecord.ts b/client/src/hooks/queries/useGetGeneRecord.ts
@@ -30,13 +30,9 @@ export function useGetGeneRecord(conceptId: string) {
   return useQuery(
     'gene-record' + conceptId,
     async () => {
-      const res = await graphQLClient.request(
-        getGeneRecordQuery,
-        {
-          conceptId,
-        },
-        { 'dgidb-client-name': 'dgidb-frontend' }
-      );
+      const res = await graphQLClient.request(getGeneRecordQuery, {
+        conceptId,
+      });
       return res;
     },
     { enabled: conceptId !== '' }

diff --git a/client/src/hooks/queries/useGetGenesForCategory.ts b/client/src/hooks/queries/useGetGenesForCategory.ts
@@ -27,14 +27,10 @@ export function useGetGenesForCategory(
   return useQuery(
     `genes-for-category-${categoryName}-db-${sourceDbNames}`,
     async () => {
-      const res = await graphQLClient.request(
-        getGenesForCategoryQuery,
-        {
-          categoryName: categoryName,
-          sourceDbNames: sourceDbNames,
-        },
-        { 'dgidb-client-name': 'dgidb-frontend' }
-      );
+      const res = await graphQLClient.request(getGenesForCategoryQuery, {
+        categoryName: categoryName,
+        sourceDbNames: sourceDbNames,
+      });
       return res;
     },
     { enabled: categoryName !== '' }

diff --git a/client/src/hooks/queries/useGetInteractionClaimTypes.ts b/client/src/hooks/queries/useGetInteractionClaimTypes.ts
@@ -17,11 +17,7 @@ const getInteractionClaimTypesQuery = gql`
 
 export function useGetInteractionClaimTypes() {
   return useQuery('interaction_claim_types', async () => {
-    const res = await graphQLClient.request(
-      getInteractionClaimTypesQuery,
-      {},
-      { 'dgidb-client-name': 'dgidb-frontend' }
-    );
+    const res = await graphQLClient.request(getInteractionClaimTypesQuery, {});
     return res;
   });
 }
diff --git a/client/src/hooks/queries/useGetInteractionRecord.ts b/client/src/hooks/queries/useGetInteractionRecord.ts
@@ -38,13 +38,9 @@ export function useGetInteractionRecord(id: string) {
   return useQuery(
     id,
     async () => {
-      const res = await graphQLClient.request(
-        getInteractionRecordQuery,
-        {
-          id,
-        },
-        { 'dgidb-client-name': 'dgidb-frontend' }
-      );
+      const res = await graphQLClient.request(getInteractionRecordQuery, {
+        id,
+      });
       return res;
     },
     { enabled: id !== '' }

diff --git a/client/src/hooks/queries/useGetInteractions.ts b/client/src/hooks/queries/useGetInteractions.ts
@@ -48,13 +48,9 @@ export function useGetInteractionsByGenes(names: string[]) {
   return useQuery(
     'interactions' + names,
     async () => {
-      const res = await graphQLClient.request(
-        getInteractionsByGenesQuery,
-        {
-          names,
-        },
-        { 'dgidb-client-name': 'dgidb-frontend' }
-      );
+      const res = await graphQLClient.request(getInteractionsByGenesQuery, {
+        names,
+      });
       return res;
     },
     { enabled: names.length > 0 }

diff --git a/client/src/hooks/queries/useGetNameSuggestions.ts b/client/src/hooks/queries/useGetNameSuggestions.ts
@@ -32,7 +32,7 @@ export function useGetNameSuggestions(searchTerm: string, type: SearchTypes) {
       const res = await graphQLClient.request(
         query,
         { term: searchTerm },
-        { 'dgidb-client-name': 'dgidb-frontend' }
+        { 'dgidb-query-type': queryName }
       );
       return res;
     },

diff --git a/server/app/controllers/concerns/analytics.rb b/server/app/controllers/concerns/analytics.rb
@@ -2,9 +2,10 @@ module Analytics
   extend ActiveSupport::Concern
 
   def get_trace_mode(request)
-    return unless Rails.env.production?
+    # return unless Rails.env.production?
 
-    if request.headers['dgidb-client-name'] == 'dgidb-frontend'
+    query_types = %w[search-genes search-drugs]
+    if request.headers['dgidb-client-name'] == 'dgidb-frontend' && query_types.include?(request.headers['dgidb-query-type'])
       :frontend_analytics
     elsif request.headers['RAW_POST_DATA'] && !request.headers['RAW_POST_DATA'].include?('IntrospectionQuery')
       :api_analytics