OpenConceptLab/ocl_issues#2287 | in TBv3

Author: snyaggarwal

.eslintrc.json

@@ -253,7 +253,8 @@
           "intensional",
           "nullable",
           "versioning",
-          "unversioned"
+          "unversioned",
+          "reranker"
         ],
         "skipIfMatch": [
           "http://[^s]*",

src/common/utils.js

@@ -445,7 +445,7 @@ export const canSwitchServer = () => {
   );
 }
 
-const hasAuthGroup = (user, groupName) => Boolean(find(user?.auth_groups, group => group.includes(groupName)))
+export const hasAuthGroup = (user, groupName) => Boolean(find(user?.auth_groups, group => group.includes(groupName)))
 
 export const canViewOperationsPanel = () => {
   const user = getCurrentUser()

src/components/app/LayoutContext.jsx

@@ -11,6 +11,7 @@ const LayoutContext = ({ subPages }) => {
   const [parentItem, setParentItem] = React.useState(null);
   const [toggles, setToggles] = React.useState({});
   const [alert, setAlert] = React.useState(false);
+  const [contextRepo, setContextRepo] = React.useState(false)
   return (
     <OperationsProvider
       value={{
@@ -27,7 +28,9 @@ const LayoutContext = ({ subPages }) => {
         setToggles: setToggles,
         toggles: toggles,
         alert: alert,
-        setAlert: setAlert
+        setAlert: setAlert,
+        contextRepo: contextRepo,
+        setContextRepo: setContextRepo
       }}>
       {subPages}
     </OperationsProvider>

src/components/repos/RepoHome.jsx

@@ -55,9 +55,10 @@ const RepoHome = () => {
   const versionFromURL = (TAB_KEYS.includes(params?.repoVersion) ? '' : params.repoVersion) || ''
 
   const [tab, setTab] = React.useState(findTab)
-  const { setAlert } = React.useContext(OperationsContext);
+  const { setAlert, setContextRepo } = React.useContext(OperationsContext);
 
   const getURL = () => ((toParentURI(location.pathname) + '/').replace('//', '/') + versionFromURL + '/').replace('//', '/')
+
   const fetchRepo = () => {
     setLoading(true)
     setStatus(false)
@@ -67,6 +68,8 @@ const RepoHome = () => {
       setLoading(false)
       const _repo = response?.data || response?.response?.data || {}
       setRepo(_repo)
+      if(!isCollection)
+        setContextRepo(_repo)
       fetchOwner()
       fetchRepoSummary()
       if(isCollection)
@@ -117,6 +120,14 @@ const RepoHome = () => {
     fetchVersions()
   }, [location.pathname])
 
+  React.useEffect(() => {
+    return () => {
+      // runs on unmount
+      setContextRepo(false);
+    };
+  }, []);
+
+
   const onVersionChange = (version, reload=true) => {
     if(reload)
       setLoading(true)

src/components/search/Search.jsx

@@ -23,7 +23,7 @@ const FILTERS_WIDTH = 250
 const FILTERABLE_RESOURCES = ['concepts', 'mappings', 'repos', 'sources', 'collections', 'references']
 
 const Search = props => {
-  const { setAlert } = React.useContext(OperationsContext);
+  const { setAlert, contextRepo } = React.useContext(OperationsContext);
   const { t } = useTranslation()
   const history = useHistory();
   const location = useLocation();
@@ -40,6 +40,8 @@ const Search = props => {
   const [showItem, setShowItem] = React.useState(false)
   const [order, setOrder] = React.useState('desc');
   const [orderBy, setOrderBy] = React.useState('score');
+  const [isMatchOp, setIsMatchOp] = React.useState(false)
+
   const didMount = React.useRef(false);
   const isFilterable = _resource => FILTERABLE_RESOURCES.includes(_resource)
 
@@ -69,6 +71,8 @@ const Search = props => {
   const getCurrentLayoutURL = (params, _resource) => {
     /*eslint no-unused-vars: 0*/
     const { q, page, limit, includeSearchMeta, sortAsc, sortDesc, ...filters} = params
+    const isMatch = params['$match']
+    delete filters['$match']
     _resource = _resource || resource || 'concepts'
     if(_resource === 'organizations')
       _resource = 'orgs'
@@ -81,6 +85,8 @@ const Search = props => {
       url += `&limit=${limit}`
     if(page && page > 1)
       url += `&page=${page}`
+    if(isMatch)
+      url += '&$match=true'
     if(!isEmpty(filters)){
       if(_resource === 'references')
         url += Object.entries(filters)
@@ -129,6 +135,7 @@ const Search = props => {
   const setQueryParamsInState = (mustFetch, includeRepoDefaultFilters) => {
     const queryParams = new URLSearchParams(window.location.hash.split('?')[1])
     const value = queryParams.get('q') || ''
+    const isMatch = queryParams.get('$match') === 'true'
     const isDiffFromPrevInput = value !== input
     const _page = parseInt(queryParams.get('page') || 1)
     const _pageSize = parseInt(queryParams.get('limit') || 25)
@@ -156,6 +163,11 @@ const Search = props => {
     if(includeRepoDefaultFilters && !_filters && props.repoDefaultFilters) {
       _filters = getAppliedFacetFromQueryParam(props.repoDefaultFilters)
     }
+    if(!isEqual(isMatch, isMatchOp)) {
+      setIsMatchOp(isMatch)
+      _fetch = true
+      _fetchFacets = false
+    }
     if(!isEqual(filters, _filters)) {
       setFilters(_filters)
       _fetchFacets = true
@@ -184,8 +196,12 @@ const Search = props => {
       _fetch = true
     }
 
-    if(_fetch)
-      fetchResults(getQueryParams(value, _page, _pageSize, _filters, _orderBy, _order), _fetchFacets, _resource)
+    if(_fetch) {
+      if(isMatch)
+        fetchMatchResults(getQueryParams(value, _page, _pageSize, _filters, _orderBy, _order))
+      else
+        fetchResults(getQueryParams(value, _page, _pageSize, _filters, _orderBy, _order), _fetchFacets, _resource)
+    }
   }
 
   const getAppliedFacetFromQueryParam = filters => {
@@ -227,6 +243,8 @@ const Search = props => {
     } else if(!_input) {
       params.sortAsc = 'id'
     }
+    if(isMatchOp)
+      params['$match'] = true
     return params
   }
 
@@ -274,6 +292,31 @@ const Search = props => {
     })
   }
 
+
+  const fetchMatchResults = (params) => {
+    let __resource = 'concepts'
+    setLoading(true)
+    setResult(prev => {
+      return {...prev, [__resource]: {...result[__resource], results: []}}
+    })
+    let _filters = omit(params, ['q', 'page', 'page_number', 'page_size', 'limit', 'offset', 'includeSearchMeta', 'verbose', 'order', 'orderBy', 'sortAsc', 'sortDesc', 'display', 'type'])
+    const payload = {rows: [{name: params.q}], target_repo_url: contextRepo?.version_url, filter: _filters || {}}
+    APIService.new().overrideURL('/concepts/$match/').post(payload, null, null, {verbose: true, includeSearchMeta: true, semantic: true, reranker: true, ...params}).then(response => {
+      if(response?.detail) {
+        setAlert({message: response.detail, severity: 'error', duration: 5000})
+        setLoading(false)
+        return
+      }
+      let __results = get(response, 'data.0.results') || []
+      let total = __results.length + 10
+      const resourceResult = {total: total, pageSize: params?.limit || 10, page: params?.page || params?.page_number || 1, pages: 2, results: __results || [], facets: result[__resource]?.facets || {}}
+      setResult(prev => {
+        return {...result, [__resource]: resourceResult}
+      })
+      setLoading(false)
+    })
+  }
+
   const fetchFacets = (params, otherResults, _resource=undefined) => {
     setLoadingFacets(true)
     const __resource = _resource || resource
@@ -451,6 +494,7 @@ const Search = props => {
                   excludedColumns={props.excludedColumns}
                   properties={props.properties}
                   propertyFilters={props.propertyFilters}
+                  isMatch={isMatchOp}
                 />
               </div>
             </div>

src/components/search/SearchInput.jsx

@@ -28,17 +28,17 @@ const SearchInput = props => {
     return false
   }
 
-  const initiateSearch = (event, global) => {
-    performSearch(event, input, global)
-      setOpen(false)
-      setTimeout(blurInput, 1000)
+  const initiateSearch = (event, global, isMatch) => {
+    performSearch(event, input, global, isMatch)
+    setOpen(false)
+    setTimeout(blurInput, 1000)
   }
 
-  const performSearch = (event, value, global) => {
+  const performSearch = (event, value, global, isMatch) => {
     event.preventDefault()
     event.stopPropagation()
 
-    props.onSearch ? props.onSearch(value) : moveToSearchPage(value, global)
+    props.onSearch ? props.onSearch(value) : moveToSearchPage(value, global, isMatch)
   }
 
   const blurInput = () => {
@@ -64,13 +64,17 @@ const SearchInput = props => {
     return URL
   }
 
-  const moveToSearchPage = (value, global) => {
+  const moveToSearchPage = (value, global, isMatch) => {
     if(!props.nested || global) {
       let _input = value || '';
       const queryParams = new URLSearchParams(location.search)
       const resourceType = queryParams.get('type') || 'concepts'
       const isGlobal = (location.pathname === '/' || global)
       let URL = applyURLRules(isGlobal ? '/search/' : location.pathname)
+      if(isMatch)
+        queryParams.set('$match', true)
+      else
+        queryParams.delete('$match')
       if(_input) {
         queryParams.set('q', _input)
         if(isGlobal)
@@ -79,6 +83,7 @@ const SearchInput = props => {
       } else if(isGlobal || queryParams.get('type')) {
         URL += `?type=${resourceType}`
       }
+
       history.push(URL.replace('?&', '?'));
     }
   }
@@ -107,11 +112,15 @@ const SearchInput = props => {
     setTimeout(blurInput, 50)
   }
 
+  const checkIsMatchOp = () => new URLSearchParams(location.search).get('$match') === 'true'
+  const isMatchOp = checkIsMatchOp()
+
   return (
     <React.Fragment>
       <SearchInputText
         id='search-input'
         onClick={() => setOpen(true)}
+        isMatchOp={isMatchOp}
         {...inputProps}
       />
       <SearchInputDrawer
@@ -120,6 +129,7 @@ const SearchInput = props => {
         input={input || ''}
         initiateSearch={initiateSearch}
         inputProps={inputProps}
+        isMatchOp={isMatchOp}
       />
     </React.Fragment>
   )