feedback fixes to seasons & segments filters (#104)

USACE · Mar 27, 2024 · 180a2d7 · 180a2d7
1 parent 30a1ff4
commit 180a2d7
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/src/app-bundles/data-entry-bundle.js b/src/app-bundles/data-entry-bundle.js
@@ -173,7 +173,6 @@ export default {
   doDataEntryLoadData: () => ({ store }) => {
     store.doDomainFieldOfficesFetch();
     store.doDomainProjectsFetch();
-    store.doDomainSeasonsFetch();
     store.doDomainSampleUnitTypesFetch();
   },
 

diff --git a/src/app-bundles/domains-bundle.js b/src/app-bundles/domains-bundle.js
@@ -105,13 +105,16 @@ export default {
     });
   },
 
-  doDomainSeasonsFetch: () => ({ dispatch, apiGet, store }) => {
+  doDomainSeasonsFetch: (year = null) => ({ dispatch, apiGet, store }) => {
     const project = store.selectUserRole()?.projectCode;
+    const office = store.selectUserRole()?.officeCode;
 
-    const url = '/psapi/seasons?' + new URLSearchParams({
-      project: project
-    });
+    const params = {
+      office: office,
+      project: project,
+    };
 
+    const url = '/psapi/seasons?' + new URLSearchParams(year === null ? params : { ...params, year: year });
 
     apiGet(url, (_err, body) => {
       dispatch({

diff --git a/src/app-bundles/sites-bundle.js b/src/app-bundles/sites-bundle.js
@@ -133,8 +133,8 @@ export default {
       id: store.selectUserRole()?.id,
       project: store.selectUserRole()?.projectCode
     };
-
     dispatch({ type: 'UPDATE_SITE_PARAMS', payload: { ...searchParams, ...paramObj } });
+    store.doDomainSeasonsFetch(searchParams?.year);
     store.doSitesFetch();
   },
 };
diff --git a/src/app-pages/data-entry/sites-list/components/sites-list.js b/src/app-pages/data-entry/sites-list/components/sites-list.js
@@ -129,15 +129,13 @@ const SitesList = connect(
           </div>
           <div className='col-sm-4 col-xs-12'>
             <div className='form-group'>
-              <FilterSelect
-                ref={segRef}
-                isDisabled={!yearFilter}
+              <Select
+                showPlaceholderWhileValid
                 label='Select Segment'
-                handleInputChange={value => setSegmentFilter(value)}
-                onChange={(_, __, val) => setSegmentValue(val)}
+                placeholderText='Segment...'
+                onChange={value => setSegmentFilter(value)}
                 value={segmentFilter}
-                placeholder='Segment...'
-                items={createDropdownOptions(segments)}
+                options={createDropdownOptions(segments)}
               />
             </div>
           </div>