OpenConceptLab/ocl_issues#2242 | project level filters

snyaggarwal · snyaggarwal · commit 39f294c64a79 · 2025-09-23T08:23:23.000+05:30
diff --git a/src/components/map-projects/ConfigurationForm.jsx b/src/components/map-projects/ConfigurationForm.jsx
@@ -1,5 +1,6 @@
 import React from 'react'
 import Typography from '@mui/material/Typography'
+import Autocomplete from '@mui/material/Autocomplete'
 import TextField from '@mui/material/TextField'
 import FormHelperText from '@mui/material/FormHelperText'
 import Button from '@mui/material/Button'
@@ -21,6 +22,7 @@ import SaveIcon from '@mui/icons-material/Save';
 import OpenInNewIcon from '@mui/icons-material/OpenInNew';
 
 import isEmpty from 'lodash/isEmpty'
+import omit from 'lodash/omit'
 
 import { toV3URL } from '../../common/utils'
 import NamespaceDropdown from '../common/NamespaceDropdown'
@@ -44,7 +46,7 @@ const VisuallyHiddenInput = styled('input')({
 });
 
 
-const ConfigurationForm = ({ project, handleFileUpload, file, owner, setOwner, name, setName, description, setDescription, repo, onRepoChange, repoVersion, setRepoVersion, versions, mappedSources, targetSourcesFromRows, algo, onAlgoSelect, sx, algos, validColumns, columns, isValidColumnValue, updateColumn, configure, setConfigure, columnVisibilityModel, setColumnVisibilityModel, onSave, isSaving, matchAPI, setMatchAPI, matchAPIToken, setMatchAPIToken, candidatesScore, onScoreChange, semanticBatchSize, setSemanticBatchSize, includeDefaultFilter, setIncludeDefaultFilter }) => {
+const ConfigurationForm = ({ project, handleFileUpload, file, owner, setOwner, name, setName, description, setDescription, repo, onRepoChange, repoVersion, setRepoVersion, versions, mappedSources, targetSourcesFromRows, algo, onAlgoSelect, sx, algos, validColumns, columns, isValidColumnValue, updateColumn, configure, setConfigure, columnVisibilityModel, setColumnVisibilityModel, onSave, isSaving, matchAPI, setMatchAPI, matchAPIToken, setMatchAPIToken, candidatesScore, onScoreChange, semanticBatchSize, setSemanticBatchSize, includeDefaultFilter, setIncludeDefaultFilter, filters, setFilters, locales }) => {
   const [algoMenuAnchorEl, setAlgoMenuAnchorEl] = React.useState(null)
 
   const onAlgoButtonClick = event => setAlgoMenuAnchorEl(algoMenuAnchorEl ? null : event.currentTarget)
@@ -54,6 +56,7 @@ const ConfigurationForm = ({ project, handleFileUpload, file, owner, setOwner, n
   }
 
   const isLLMAlgoNotAllowed = !repoVersion?.match_algorithms?.includes('llm')
+  const appliedLocales = filters?.locale ? filters?.locale?.split(',') : []
 
   return (
     <div className='col-xs-12' style={{padding: '8px 0', ...sx}}>
@@ -148,10 +151,48 @@ const ConfigurationForm = ({ project, handleFileUpload, file, owner, setOwner, n
             {`${repo?.owner}:${repo?.short_code || repo?.id}:${repoVersion?.id || repo?.version || repo?.id} is not configured to run Semantic Search`}
           </FormHelperText>
       }
+      {
+        locales?.length > 0 &&
+          <Autocomplete
+            multiple
+            size='small'
+            id="locale"
+            options={locales}
+            getOptionLabel={(option) => option}
+            value={appliedLocales}
+            onChange={(event, values) => {
+              setFilters({...filters, locale: values.join(',')})
+            }}
+            sx={{marginTop: '12px'}}
+            renderInput={(params) => (
+              <TextField
+                {...params}
+                size='small'
+                label="Filter Name Locales"
+                helperText="Note: Restricting candidates to specific languages limits cross-lingual matching capabilities, but may improve the accuracy of results for certain datasets, especially if the input data is in the same language as a target repository's default language."
+              />
+            )}
+          />
+      }
       {
         !isEmpty(repoVersion?.meta?.display?.default_filter) && repoVersion?.meta?.display?.default_filter &&
           <FormHelperText sx={{marginLeft: '8px'}}>
-            <FormControlLabel size='small' control={<Checkbox size='small' checked={includeDefaultFilter} onChange={event => setIncludeDefaultFilter(event.target.checked)} sx={{padding: '8px 4px'}} />} label="Default Filter" />
+            <FormControlLabel
+              size='small'
+              control={
+                <Checkbox
+                  size='small'
+                  checked={includeDefaultFilter}
+                  sx={{padding: '8px 4px'}}
+                  onChange={() => {
+                    const newValue = !includeDefaultFilter
+                    setIncludeDefaultFilter(newValue);
+                    setFilters(newValue ? {...filters, ...repoVersion.meta.display.default_filter} : omit(filters, Object.keys(repoVersion.meta.display.default_filter)))
+                  }}
+                />
+              }
+              label="Default Filter"
+            />
           <div style={{whiteSpace: 'pre'}}>{JSON.stringify(repoVersion.meta.display.default_filter, undefined, 2)}</div>
         </FormHelperText>
       }
diff --git a/src/components/map-projects/MapProject.jsx b/src/components/map-projects/MapProject.jsx
@@ -152,6 +152,7 @@ const MapProject = () => {
   const [matchAPIToken, setMatchAPIToken] = React.useState('')
   const [semanticBatchSize, setSemanticBatchSize] = React.useState(SEMANTIC_BATCH_SIZE)
   const [candidatesScore, setCandidatesScore] = React.useState({recommended: 100, available: 70})
+  const [filters, setFilters] = React.useState({})
 
   const abortRef = React.useRef(false);
 
@@ -183,6 +184,7 @@ const MapProject = () => {
   const [repo, setRepo] = React.useState(false)
   const [repoVersion, setRepoVersion] = React.useState(false)
   const [mappedSources, setMappedSources] = React.useState([])
+  const [locales, setLocales] = React.useState([])
   const [versions, setVersions] = React.useState([])
   const [conceptCache, setConceptCache] = React.useState({})
   const [allMapTypes, setAllMapTypes] = React.useState([])
@@ -230,6 +232,11 @@ const MapProject = () => {
     setPermissionDenied(false)
   }, [params.projectId])
 
+  React.useEffect(() => {
+    const isDefaultApplied = isRepoDefaultFilterApplied(repoVersion)
+    setIncludeDefaultFilter(Boolean(isDefaultApplied))
+  }, [repoVersion, project])
+
 
   const fetchAndSetProject = () => {
     setLoadingProject(true)
@@ -241,6 +248,7 @@ const MapProject = () => {
         setLoadingProject(false)
         return
       }
+      setFilters(response.data?.filters || {})
       if(response.data.url) {
         APIService.new().overrideURL(response.data.url).appendToUrl('logs/').get().then(response => setLogs(response.data.logs || []))
       }
@@ -297,6 +305,11 @@ const MapProject = () => {
     })
   }
 
+  const isRepoDefaultFilterApplied = version => {
+    const defaultFilter = version?.meta?.display?.default_filter || {};
+    return !isEmpty(defaultFilter) && Object.keys(defaultFilter).every(key => has((project.filters || {}), key));
+  }
+
   const fetchMapTypes = () => APIService.orgs('OCL').sources('MapTypes').appendToUrl('concepts/lookup/').get().then(response => setAllMapTypes(response.data?.map(d => d.id)))
 
   const alertUser = (e) => {
@@ -582,6 +595,7 @@ const MapProject = () => {
       formData.append('match_api_url', '')
       formData.append('match_api_token', '')
     }
+    formData.append('filters', JSON.stringify(getFilters()))
     let service = APIService.new().overrideURL(owner).appendToUrl('map-projects/')
     if(project?.id)
       service = service.appendToUrl(project.id + '/').put(formData, null, {"Content-Type": "multipart/form-data"})
@@ -631,6 +645,12 @@ const MapProject = () => {
     recurse(0, 1, 0, [])
   }
 
+  const fetchLocaleDistribution = url => {
+    if(!url)
+      return
+    APIService.new().overrideURL(url).appendToUrl('summary/').get(null, null, {verbose: true, distribution: 'name_locale'}).then(response => setLocales(map(response?.data?.distribution?.name_locale, 'locale')))
+  }
+
   const _fetchMappedSources = (
     url, limit, offset, page, callback
   ) => {
@@ -640,6 +660,7 @@ const MapProject = () => {
   const onRepoVersionChange = version => {
     setRepoVersion(version)
     if(version?.version_url) {
+      fetchLocaleDistribution(version.version_url)
       fetchMappedSources(version.version_url)
       updateAlgosByRepoVersion(version)
     }
@@ -662,6 +683,12 @@ const MapProject = () => {
     setAlgoMenuAnchorEl(null)
   }
 
+  const getFilters = () => {
+    let defaultFilters = (repoVersion?.meta?.display?.default_filter || {})
+    let allFilters = {...filters, ...defaultFilters}
+    return includeDefaultFilter ? allFilters : omit(allFilters, Object.keys(defaultFilters))
+  }
+
   const getPayloadForMatching = (rows, _repo) => {
     return {
       rows: map(rows, row => prepareRow(row)),
@@ -673,7 +700,7 @@ const MapProject = () => {
         'source': _repo.short_code || _repo.id
       },
       map_config: getMapConfigs(),
-      filter: includeDefaultFilter ? repoVersion?.meta?.display?.default_filter || {} : {}
+      filter: getFilters()
     }
   }
 
@@ -1060,6 +1087,10 @@ const MapProject = () => {
 
     if(repo?.id) {
       fetchOtherCandidates(csvRow)
+      const _filters = getFilters()
+      if(!appliedFacets[csvRow.__index] && !isEmpty(_filters) && _filters) {
+        setAppliedFacets({...appliedFacets, [csvRow.__index]: getAppliedFacetFromQueryParam(_filters)})
+      }
     }
 
     const el = document.querySelector(`div[data-id="${csvRow.__index}"]`)
@@ -1149,7 +1180,7 @@ const MapProject = () => {
       fetchOtherCandidates()
     }
     if(newValue === 'search' && isEmpty(facets[rowIndex]))
-      getFacets()
+      getFacets(true)
   }
 
   const onDecisionChange = (event, newValue) => {
@@ -1282,7 +1313,6 @@ const MapProject = () => {
       q: searchStr,
       page: page || 1,
       includeRetired: includeRetired === undefined ? retired : includeRetired,
-      conceptFilterDefault: includeDefaultFilter,
       ...getFacetQueryParam(appliedFilters || appliedFacets[rowIndex]),
     }).then(response => {
       let items = response.data
@@ -1300,13 +1330,13 @@ const MapProject = () => {
     });
   }
 
-  const getFacets = _row => {
+  const getFacets = firstLoad => {
     APIService.new().overrideURL(repoVersion.version_url).appendToUrl('concepts/').get(null, null, {
-      q: searchStr,
+      q: firstLoad ? '' : searchStr,
       includeRetired: retired,
       facetsOnly: true
     }).then(response => {
-      setFacets({...facets, [_row?.__index === undefined ? row.__index : _row.__index]: response?.data?.facets?.fields || {}})
+      setFacets({...facets, [row.__index]: response?.data?.facets?.fields || {}})
     })
   }
 
@@ -1324,6 +1354,15 @@ const MapProject = () => {
     return queryParam
   }
 
+  const getAppliedFacetFromQueryParam = filters => {
+    const applied = {}
+    forEach(filters, (value, field) => {
+      applied[field] = {}
+      forEach(value.split(','), val => applied[field][val] = true)
+    })
+    return applied
+  }
+
 
   const isSplitView = Boolean(rowIndex !== undefined) || (configure && file?.name)
   const rows = getRows()
@@ -1458,6 +1497,9 @@ const MapProject = () => {
                     onScoreChange={setCandidatesScore}
                     includeDefaultFilter={includeDefaultFilter}
                     setIncludeDefaultFilter={setIncludeDefaultFilter}
+                    filters={filters}
+                    setFilters={setFilters}
+                    locales={locales}
                   />
                 </div>
           }
@@ -1828,6 +1870,9 @@ const MapProject = () => {
                 onScoreChange={setCandidatesScore}
                 includeDefaultFilter={includeDefaultFilter}
                 setIncludeDefaultFilter={setIncludeDefaultFilter}
+                filters={filters}
+                setFilters={setFilters}
+                locales={locales}
               />
             </div> :
           (
@@ -1953,6 +1998,7 @@ const MapProject = () => {
                       setSearchStr={setSearchStr}
                       facets={facets[rowIndex]}
                       appliedFacets={appliedFacets[rowIndex]}
+                      filters={getFilters()}
                       isLoading={isLoadingInDecisionView}
                       setAppliedFacets={(filters) => {
                         setAppliedFacets({...appliedFacets, [rowIndex]: filters})
diff --git a/src/components/map-projects/Search.jsx b/src/components/map-projects/Search.jsx
@@ -22,7 +22,7 @@ import Mappings from './Mappings'
 import Concept from './Concept'
 import MapButton from './MapButton'
 
-const Search = ({searchStr, setSearchStr, onSearch, repo, repoVersion, concepts, setShowItem, showItem, isSelectedForMap, onMap, response, facets, appliedFacets, setAppliedFacets, isLoading}) => {
+const Search = ({searchStr, setSearchStr, onSearch, repo, repoVersion, concepts, setShowItem, showItem, isSelectedForMap, onMap, response, facets, appliedFacets, setAppliedFacets, isLoading, filters}) => {
   const [openFilters, setOpenFilters] = React.useState(openFilters)
   const [display, setDisplay] = React.useState('card')
   let total = parseInt(response?.headers?.num_found) || concepts?.length || 0
@@ -120,7 +120,7 @@ const Search = ({searchStr, setSearchStr, onSearch, repo, repoVersion, concepts,
                 filters={facets}
                 appliedFilters={appliedFacets || {}}
                 onChange={setAppliedFacets}
-                repoDefaultFilters={repoVersion?.meta?.display?.default_filter}
+                repoDefaultFilters={filters}
                 properties={repoVersion?.meta?.display?.concept_summary_properties}
                 propertyFilters={repoVersion?.filters}
                 heightToSubtract={523}
