OpenConceptLab/ocl_issues#2244 | filters per row on candidates and reset | saving only auto match ones

Author: snyaggarwal

src/components/map-projects/Candidates.jsx

@@ -129,7 +129,7 @@ const CandidateList = ({candidates, header, rowIndex, orderBy, order, onOrderCha
   ): null
 }
 
-const Candidates = ({rowIndex, alert, setAlert, candidates, orderBy, order, onOrderChange, setShowItem, showItem, setShowHighlights, isSelectedForMap, onMap, onFetchMore, isLoading, candidatesScore, repoVersion, analysis, onFetchRecommendation, appliedFacets, setAppliedFacets, filters, facets, columns}) => {
+const Candidates = ({rowIndex, alert, setAlert, candidates, orderBy, order, onOrderChange, setShowItem, showItem, setShowHighlights, isSelectedForMap, onMap, onFetchMore, isLoading, candidatesScore, repoVersion, analysis, onFetchRecommendation, appliedFacets, setAppliedFacets, filters, facets, columns, defaultFilters}) => {
   const inAIAssistantGroup = hasAuthGroup(getCurrentUser(), 'mapper_ai_assistant')
   const [openFilters, setOpenFilters] = React.useState(false)
   const [display, setDisplay] = React.useState('card')
@@ -224,6 +224,7 @@ const Candidates = ({rowIndex, alert, setAlert, candidates, orderBy, order, onOr
               appliedFilters={appliedFacets || {}}
               onChange={setAppliedFacets}
               repoDefaultFilters={filters}
+              defaultFilters={defaultFilters}
               properties={repoVersion?.meta?.display?.concept_summary_properties}
               propertyFilters={repoVersion?.filters}
               heightToSubtract={523}

src/components/map-projects/MapProject.jsx

@@ -135,6 +135,7 @@ const MapProject = () => {
   const [matchTypes, setMatchTypes] = React.useState({very_high: 0, high: 0, medium: 0, low: 0, no_match: 0})
   const [matchedConcepts, setMatchedConcepts] = React.useState([]);
   const [otherMatchedConcepts, setOtherMatchedConcepts] = React.useState([]);
+  const [candidatesToSave, setCandidatesToSave] = React.useState([]);
   const [searchedConcepts, setSearchedConcepts] = React.useState({});
   const [facets, setFacets] = React.useState({});
   const [appliedFacets, setAppliedFacets] = React.useState({});
@@ -294,6 +295,7 @@ const MapProject = () => {
         setLoadingProject(false)
       }
       setOtherMatchedConcepts(response?.data?.candidates || [])
+      setCandidatesToSave(response?.data?.candidates || [])
       setName(response.data?.name || '')
       setDescription(response.data?.description || '')
       setOwner(response.data?.owner_url)
@@ -583,7 +585,7 @@ const MapProject = () => {
       }
     })
     const candidates = []
-    forEach(otherMatchedConcepts, _candidates => {
+    forEach(candidatesToSave, _candidates => {
       if(_candidates?.results?.length) {
         candidates.push({..._candidates, results: _candidates.results.splice(0, 10)})
       }
@@ -702,7 +704,7 @@ const MapProject = () => {
     return includeDefaultFilter ? allFilters : omit(allFilters, Object.keys(defaultFilters))
   }
 
-  const getPayloadForMatching = (rows, _repo) => {
+  const getPayloadForMatching = (rows, _repo, _filters) => {
     return {
       rows: map(rows, row => prepareRow(row)),
       target_repo_url: repoVersion?.version_url || _repo.version_url || _repo.url,
@@ -713,7 +715,7 @@ const MapProject = () => {
         'source': _repo.short_code || _repo.id
       },
       map_config: getMapConfigs(),
-      filter: getFilters()
+      filter: rows.length > 1 ? getFilters() : getFacetQueryParam(isEmpty(_filters) ? appliedFacets[rows[0].__index] : _filters)
     }
   }
 
@@ -818,6 +820,9 @@ const MapProject = () => {
                 setOtherMatchedConcepts(prev => {
                   return [...reject(prev, c => c.row.__index === concept.row.__index), concept]
                 })
+                setCandidatesToSave(prev => {
+                  return [...reject(prev, c => c.row.__index === concept.row.__index), concept]
+                })
               })
             setMatchedConcepts(prev => [...prev, ...data]);
             activeRequests.delete(promise); // Remove from active set after completion
@@ -1264,17 +1269,17 @@ const MapProject = () => {
       log({action: newValue || 'decision_changed', description: 'Desicion Changed to None', extras: newValue ? {} : {decision: 'None'}})
   }
 
-  const fetchOtherCandidates = (_row, offset=0, _retired, scrollToBottom) => {
+  const fetchOtherCandidates = (_row, offset=0, _retired, scrollToBottom, _filters, forceReload=false) => {
     setAlert(false)
     if(isAnyValidColumn()) {
       let __row = isEmpty(_row) ? row : _row
       const existingCandidates = find(otherMatchedConcepts, c => c.row.__index === __row.__index)?.results
-      if(offset === 0 && !_retired && existingCandidates?.length> 0) {
+      if(!forceReload && offset === 0 && !_retired && existingCandidates?.length> 0) {
         setTimeout(() => highlightTexts(existingCandidates, null, false), 100)
         return
       }
       setIsLoadingInDecisionView(true)
-      const payload = getPayloadForMatching([__row], repo)
+      const payload = getPayloadForMatching([__row], repo, _filters)
       const service = getMatchAPIService()
       service.post(
         payload,
@@ -2031,10 +2036,11 @@ const MapProject = () => {
                       columns={getValidColumns()}
                       facets={facets[rowIndex]}
                       appliedFacets={appliedFacets[rowIndex]}
+                      defaultFilters={getAppliedFacetFromQueryParam(getFilters())}
                       filters={getFilters(rowIndex)}
                       setAppliedFacets={(filters) => {
-                        setAppliedFacets({...appliedFacets, [rowIndex]: filters})
-                        search(null, null, null, null, filters)
+                        setAppliedFacets(() => ({...appliedFacets, [rowIndex]: filters}))
+                        fetchOtherCandidates(null, 0, false, false, filters, true)
                       }}
                     />
                 }
@@ -2057,6 +2063,7 @@ const MapProject = () => {
                       columns={getValidColumns()}
                       facets={facets[rowIndex]}
                       appliedFacets={appliedFacets[rowIndex]}
+                      defaultFilters={getAppliedFacetFromQueryParam(getFilters())}
                       filters={getFilters()}
                       setAppliedFacets={(filters) => {
                         setAppliedFacets({...appliedFacets, [rowIndex]: filters})

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, filters, columns}) => {
+const Search = ({searchStr, setSearchStr, onSearch, repo, repoVersion, concepts, setShowItem, showItem, isSelectedForMap, onMap, response, facets, appliedFacets, setAppliedFacets, isLoading, filters, columns, defaultFilters}) => {
   const [openFilters, setOpenFilters] = React.useState(false)
   const [display, setDisplay] = React.useState('card')
   let total = parseInt(response?.headers?.num_found) || concepts?.length || 0
@@ -121,6 +121,7 @@ const Search = ({searchStr, setSearchStr, onSearch, repo, repoVersion, concepts,
                 appliedFilters={appliedFacets || {}}
                 onChange={setAppliedFacets}
                 repoDefaultFilters={filters}
+                defaultFilters={defaultFilters}
                 properties={repoVersion?.meta?.display?.concept_summary_properties}
                 propertyFilters={repoVersion?.filters}
                 heightToSubtract={523}

src/components/search/SearchFilters.jsx

@@ -19,7 +19,7 @@ import CircularProgress from '@mui/material/CircularProgress';
 import { URIToParentParams, currentUserHasAccess } from '../../common/utils'
 import { FACET_ORDER } from './ResultConstants';
 
-const SearchFilters = ({filters, resource, onChange, kwargs, bgColor, appliedFilters, fieldOrder, noSubheader, disabledZero, filterDefinitions, nested, onSaveAsDefaultFilters, loading, repoDefaultFilters, propertyFilters, heightToSubtract, open, columns}) => {
+const SearchFilters = ({filters, resource, onChange, kwargs, bgColor, appliedFilters, fieldOrder, noSubheader, disabledZero, filterDefinitions, nested, onSaveAsDefaultFilters, loading, repoDefaultFilters, propertyFilters, heightToSubtract, open, columns, defaultFilters}) => {
   const { t } = useTranslation()
   const [applied, setApplied] = React.useState({});
   const [count, setCount] = React.useState(0);
@@ -134,12 +134,11 @@ const SearchFilters = ({filters, resource, onChange, kwargs, bgColor, appliedFil
     setApplied(newApplied)
   };
 
-  const onClear = () => {
-    setApplied({})
-    setCount(0)
-    if(onSaveAsDefaultFilters)
-      onSaveAsDefaultFilters({})
-    onChange({})
+  const onReset = () => {
+    let __filters = defaultFilters || {}
+    setApplied(__filters)
+    onChange(__filters)
+    setCount(flatten(values(__filters).map(v => values(v))).length)
   }
 
   const onApply = () => {
@@ -285,8 +284,8 @@ const SearchFilters = ({filters, resource, onChange, kwargs, bgColor, appliedFil
             <Button variant='text' color='primary' style={{textTransform: 'none'}} onClick={onApply} disabled={!unapplied}>
               {t('common.apply')}
             </Button>
-            <Button variant='text' style={{textTransform: 'none'}} onClick={onClear} disabled={!count} color='error'>
-              {t('common.clear')}
+            <Button variant='text' style={{textTransform: 'none'}} onClick={onReset} disabled={!count || isEqual(defaultFilters, appliedFilters)} color='error'>
+              {t('common.reset')}
             </Button>
           </span>
         </div>

src/i18n/locales/en/translations.json

@@ -90,6 +90,7 @@
     "properties": "Properties",
     "custom": "Custom",
     "apply": "Apply",
+    "reset": "Reset",
     "checking_auth": "Checking auth..."
   },
   "errors": {