Merge pull request #459 from CBIIT/INS-1420

Ins 1420

Author: jonkiky

public/injectEnv.js

@@ -10,9 +10,9 @@ window.injectedEnv = {
   REACT_APP_FILE_SERVICE_API: 'http://localhost:3000/api/files/',
   REACT_APP_AUTH_SERVICE_API: 'http://localhost:3000/api/auth/',
   REACT_APP_USER_SERVICE_API: 'http://localhost:3000/api/users/',
-  REACT_APP_DATA_VERSION: '2.0.0',
-  REACT_APP_BE_VERSION: '3.1.0',
-  REACT_APP_FE_VERSION: '3.1.0',
+  REACT_APP_DATA_VERSION: '2.2.0',
+  REACT_APP_BE_VERSION: '3.2.0',
+  REACT_APP_FE_VERSION: '3.2.0',
   REACT_APP_REST_BACKEND: 'https://studycatalog-dev.cancer.gov/service/datasets/',
   // IDP Auth url
   REACT_APP_NIH_AUTH_URL: 'https://stsstg.nih.gov/auth/oauth/v2/authorize',

src/api/searchFiltersApi.js

@@ -3,8 +3,12 @@ import env from '../utils/env';
 
 const baseUrl = env.REACT_APP_REST_BACKEND_API;
 
-export function getSearchFilters() {
-  return fetch(`${baseUrl}filters`)
+export function getSearchFilters(body) {
+  return fetch(`${baseUrl}filters`, {
+    method: 'POST',
+    body: JSON.stringify(body),
+    headers: { 'Content-Type': 'application/json' },
+  })
     .then(handleResponse)
     .catch(handleError);
 }

src/bento/globalFooterData.js

@@ -5,7 +5,7 @@ export default {
   footerLogoText: 'National Cancer Institute',
   footerLogoSubText: 'at the National Institutes of Health',
   footerLogoHyperlink: 'https://cancer.gov/',
-  footerStaticText: 'NIH … Turning Discovery Into Health®',
+  footerStaticText: 'NIH…Turning Discovery Into Health®',
   FEversion: env.REACT_APP_FE_VERSION,
   BEversion: env.REACT_APP_BE_VERSION,
   DATAversion: env.REACT_APP_DATA_VERSION,
@@ -36,13 +36,13 @@ export default {
           link: 'Release_v3.1.0.pdf',
         },
         {
-          text: `FE Version: ${env.REACT_APP_FE_VERSION || '3.1.0'}`,
+          text: `FE Version: ${env.REACT_APP_FE_VERSION || '3.2.0'}`,
         },
         {
-          text: `BE Version: ${env.REACT_APP_BE_VERSION || '3.1.0'}`,
+          text: `BE Version: ${env.REACT_APP_BE_VERSION || '3.2.0'}`,
         },
         {
-          text: `Data Version: ${env.REACT_APP_DATA_VERSION || '2.0.0'}`,
+          text: `Data Version: ${env.REACT_APP_DATA_VERSION || '2.2.0'}`,
           link: 'https://github.com/CBIIT/INS-Data',
         },
       ],

src/pages/dataSets/Filters/Filters.js

@@ -84,11 +84,6 @@ const Filters = ({
     }
   }, []);
 
-  const handleResourceClick = (filter) => {
-    const queryStr = replaceResourceFilter(query, filter);
-    history.push(`/datasets?${queryStr}`);
-  };
-
   const handleResourceClickDataRepository = (filter) => {
     const queryStr = replaceResourceFilter(query, filter, 'filterByRepo');
     history.push(`/datasets?${queryStr}`);

src/redux/actions/searchActions.js

@@ -2,6 +2,8 @@ import * as types from './actionTypes';
 import * as searchApi from '../../api/searchApi';
 import * as participatingResourcesApi from '../../api/participatingResourcesApi';
 
+import { getSearchFilters } from '../../api/searchFiltersApi';
+
 export function loadSearchFiltersSuccess(resourcesList) {
   return { type: types.LOAD_RESOURCES_LIST_SUCCESS, resourcesList };
 }
@@ -88,8 +90,17 @@ export function loadFromUrlQuery(searchText, filters) {
     searchCriteria.sort.k = 'dataset_title.sort';
     searchCriteria.sort.v = filters.sortOrder || 'asc';
 
-    return searchApi.searchCatalog(searchCriteria)
-      .then((searchResults) => {
+    // Call both searchCatalog and getSearchFilters in parallel
+    // For filters endpoint, include only search_text and filters in the body
+    const filtersBody = {
+      search_text: searchCriteria.search_text,
+      filters: searchCriteria.filters,
+    };
+    return Promise.all([
+      searchApi.searchCatalog(searchCriteria),
+      getSearchFilters(filtersBody),
+    ])
+      .then(([searchResults, filtersResults]) => {
         dispatch(loadSearchResultsSuccess(searchResults.data));
         dispatch(runFullTextSearch(searchText));
         dispatch(applyResourcesFilter(searchCriteria.filters));
@@ -100,6 +111,10 @@ export function loadFromUrlQuery(searchText, filters) {
           k: searchResults.data.sort.k,
         }));
         dispatch(switchSortingOrder(searchResults.data.sort.v));
+        // Optionally update filters in state if needed
+        if (filtersResults && filtersResults.data) {
+          dispatch(loadSearchFiltersSuccess(filtersResults.data));
+        }
       })
       .catch((error) => {
         throw error;