OpenConceptLab/ocl_issues#1068 | ICD-11 fhir connector | initial list…

…ing/pagination/search
OpenConceptLab · Nov 30, 2021 · e4a25aa · e4a25aa
1 parent 65ab567
commit e4a25aa
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 11 deletions.
diff --git a/src/common/serverConfigs.js b/src/common/serverConfigs.js
@@ -107,4 +107,26 @@ export const SERVER_CONFIGS = [
       }
     }
   },
+  {
+    id: 12,
+    name: 'ICD 11',
+    type: 'fhir',
+    hapi: false,
+    url: 'https://icdapitest2.azurewebsites.net',
+    info: {
+      baseURI: '/fhir/',
+      type: 'HAPI FHIR 4.2.0 REST Server (FHIR Server; FHIR 4.0.1/R4)',
+      org: {
+        id: 'ICD-11 (v2.1.0)',
+        name: "FHIR capability statement for ICD-API FHIR Extension",
+        logo_url: '/fhir.svg'
+      },
+      paginationParams: {
+        _getpagesoffset: 0,
+        _count: 25,
+        _sort: '_id'
+      },
+      searchMode: 'hapi'
+    }
+  },
 ]
diff --git a/src/components/fhir/Fhir.jsx b/src/components/fhir/Fhir.jsx
@@ -28,7 +28,7 @@ class Fhir extends React.Component {
   render() {
     const { tab, config } = this.state;
     const { info, url, hapi } = this.serverConfig;
-    const { org, pageSize } = info;
+    const { org, pageSize, paginationParams, searchMode } = info;
     return (
       <div className='col-md-12 home-container no-side-padding'>
         <OrgHomeHeader
@@ -54,6 +54,8 @@ class Fhir extends React.Component {
             selectedConfig={config}
             limit={pageSize}
             hapi={hapi}
+            paginationParams={paginationParams}
+            searchMode={searchMode}
           />
         }
       </div>

diff --git a/src/components/fhir/FhirTabs.jsx b/src/components/fhir/FhirTabs.jsx
@@ -5,7 +5,9 @@ import OrgHomeChildrenList from '../orgs/OrgHomeChildrenList';
 import { DEFAULT_LIMIT } from '../../common/constants';
 
 
-const FhirTabs = ({ tab, onTabChange, selectedConfig, org, location, match, url, limit, hapi, nested}) => {
+const FhirTabs = ({
+  tab, onTabChange, selectedConfig, org, location, match, url, limit, hapi, nested, paginationParams, searchMode
+}) => {
   const tabConfigs = selectedConfig.config.tabs;
   const selectedTabConfig = tabConfigs[tab];
   const getTABHref = config => {
@@ -35,19 +37,21 @@ const FhirTabs = ({ tab, onTabChange, selectedConfig, org, location, match, url,
             isTable: (selectedTabConfig.layout || '').toLowerCase() !== 'list',
             sortParams: {sortAsc: '_id'}
           }}
-          fhirParams={{
+          fhirParams={paginationParams ? paginationParams : {
             _getpagesoffset: 0,
             _count: limit || DEFAULT_LIMIT,
             _sort: '_id'
           }}
-          staticParams={{
+          staticParams={ hapi ? {
             _total: 'accurate',
-          }}
+          } : {}}
           noQuery
           noHeaders
           nested
           fhir
           hapi={hapi}
+          paginationParams={paginationParams}
+          searchMode={searchMode}
         />
       </div>
     </div>

diff --git a/src/components/search/Search.jsx b/src/components/search/Search.jsx
@@ -361,7 +361,7 @@ class Search extends React.Component {
         resource, searchStr, page, exactMatch, sortParams, updatedSince, limit,
         includeRetired, fhirParams, staticParams
       } = this.state;
-      const { configQueryParams, noQuery, noHeaders, fhir, hapi } = this.props;
+      const { configQueryParams, noQuery, noHeaders, fhir, hapi, paginationParams } = this.props;
       let queryParams = {};
       if(!noQuery) {
         queryParams = {
@@ -380,14 +380,13 @@ class Search extends React.Component {
       if(!noQuery)
         params = {...params, ...queryParams, ...sortParams, ...(configQueryParams || {})}
       if(fhir) {
-        if(hapi)
+        if(hapi || paginationParams)
           params = {...params, ...fhirParams}
         else
           params = {...params, page: page, ...fhirParams}
       }
 
       const baseURL = this.prepareBaseURL()
-
       fetchSearchResults(
         _resource,
         params,

diff --git a/src/components/search/SearchByAttributeInput.jsx b/src/components/search/SearchByAttributeInput.jsx
@@ -18,18 +18,19 @@ const HAPI_FHIR_ATTRIBUTES = [
   {id: 'version', label: 'Version'},
   {id: 'description', label: 'Description'},
 ]
-const OCL_FHIR_ATTRIBUTESS = [
+const OCL_FHIR_ATTRIBUTES = [
   DEFAULT_OCL_FHIR_ATTRIBUTE,
   {id: 'content-mode', label: 'Content Mode'},
   {id: 'publisher', label: 'Publisher'},
 ]
 class SearchByAttributeInput extends React.Component {
   constructor(props) {
     super(props);
+    const isHAPISearchMode = props.hapi || props.searchMode === 'hapi'
     this.state = {
       input: '',
-      attrs: props.hapi ? HAPI_FHIR_ATTRIBUTES : OCL_FHIR_ATTRIBUTESS,
-      selectedAttribute: props.hapi ? DEFAULT_HAPI_FHIR_ATTRIBUTE : DEFAULT_OCL_FHIR_ATTRIBUTE,
+      attrs: isHAPISearchMode ? HAPI_FHIR_ATTRIBUTES : OCL_FHIR_ATTRIBUTES,
+      selectedAttribute: isHAPISearchMode ? DEFAULT_HAPI_FHIR_ATTRIBUTE : DEFAULT_OCL_FHIR_ATTRIBUTE,
       anchorEl: null,
     }
   }