OHRI-1839 Support for rendering problem by concept class (#125)

* add support for rendering a problem by concept class * refactor concept datasource
openmrs · Oct 6, 2023 · 9b46355 · 9b46355
1 parent 3b490ee
commit 9b46355
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 4 deletions.
diff --git a/src/api/types.ts b/src/api/types.ts
@@ -259,3 +259,13 @@ export interface DataSource<T> {
    */
   toUuidAndDisplay(item: T): OpenmrsResource;
 }
+
+export interface ControlTemplate {
+  name: string;
+  datasource: DataSourceParameters;
+}
+
+export interface DataSourceParameters {
+  name: string;
+  config?: Record<string, any>;
+}
diff --git a/src/datasources/concept-data-source.ts b/src/datasources/concept-data-source.ts
@@ -3,13 +3,21 @@ import { BaseOpenMRSDataSource } from './data-source';
 
 export class ConceptDataSource extends BaseOpenMRSDataSource {
   constructor() {
-    super('/ws/rest/v1/concept?name=&searchType=fuzzy&v=custom:(uuid,display)');
+    super('/ws/rest/v1/concept?name=&searchType=fuzzy&v=custom:(uuid,display,conceptClass:(uuid,display))');
   }
 
   fetchData(searchTerm: string, config?: Record<string, any>): Promise<any[]> {
     if (config?.class) {
-      let urlParts = this.url.split('name=');
-      this.url = `${urlParts[0]}&name=&class=${config.class}&${urlParts[1]}`;
+      if (typeof config.class == 'string') {
+        let urlParts = this.url.split('name=');
+        this.url = `${urlParts[0]}&name=&class=${config.class}&${urlParts[1]}`;
+      } else {
+        return openmrsFetch(searchTerm ? `${this.url}&q=${searchTerm}` : this.url).then(({ data }) => {
+          return data.results.filter(
+            concept => concept.conceptClass && config.class.includes(concept.conceptClass.uuid),
+          );
+        });
+      }
     }
     return openmrsFetch(searchTerm ? `${this.url}&q=${searchTerm}` : this.url).then(({ data }) => {
       return data.results;

diff --git a/src/registry/inbuilt-components/control-templates.ts b/src/registry/inbuilt-components/control-templates.ts
@@ -1,4 +1,6 @@
-export const controlTemplates = [
+import { ControlTemplate } from '../../api/types';
+
+export const controlTemplates: Array<ControlTemplate> = [
   {
     name: 'drug',
     datasource: {
@@ -8,6 +10,15 @@ export const controlTemplates = [
       },
     },
   },
+  {
+    name: 'problem',
+    datasource: {
+      name: 'problem_datasource',
+      config: {
+        class: ['8d4918b0-c2cc-11de-8d13-0010c6dffd0f', '8d492954-c2cc-11de-8d13-0010c6dffd0f'],
+      },
+    },
+  },
 ];
 
 export const getControlTemplate = (name: string) => {

diff --git a/src/registry/inbuilt-components/inbuiltDataSources.ts b/src/registry/inbuilt-components/inbuiltDataSources.ts
@@ -15,6 +15,10 @@ export const inbuiltDataSources: Array<RegistryItem<DataSource<any>>> = [
     name: 'drug_datasource',
     component: new ConceptDataSource(),
   },
+  {
+    name: 'problem_datasource',
+    component: new ConceptDataSource(),
+  },
 ];
 
 export const validateInbuiltDatasource = (name: string) => {

diff --git a/src/registry/inbuilt-components/template-component-map.ts b/src/registry/inbuilt-components/template-component-map.ts
@@ -5,4 +5,8 @@ export const templateToComponentMap = [
     name: 'drug',
     baseControlComponent: UISelectExtended,
   },
+  {
+    name: 'problem',
+    baseControlComponent: UISelectExtended,
+  }
 ];