refactor concept datasource

openmrs · Oct 6, 2023 · ad85f5b · ad85f5b
1 parent 51fdc75
commit ad85f5b
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 34 deletions.
diff --git a/src/api/types.ts b/src/api/types.ts
@@ -260,13 +260,12 @@ export interface DataSource<T> {
   toUuidAndDisplay(item: T): OpenmrsResource;
 }
 
-export interface ControlTemplate{
-  name: string,
-  datasource: DataSourceParameters
+export interface ControlTemplate {
+  name: string;
+  datasource: DataSourceParameters;
 }
 
-export interface DataSourceParameters{
-  name: string,
-  config?: Record<string, any>
+export interface DataSourceParameters {
+  name: string;
+  config?: Record<string, any>;
 }
-
diff --git a/src/datasources/class-array-datasource.ts b/src/datasources/class-array-datasource.ts
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,4 @@
-import { ControlTemplate } from "../../api/types";
+import { ControlTemplate } from '../../api/types';
 
 export const controlTemplates: Array<ControlTemplate> = [
   {
@@ -15,9 +15,7 @@ export const controlTemplates: Array<ControlTemplate> = [
     datasource: {
       name: 'problem_datasource',
       config: {
-        class: ['8d4918b0-c2cc-11de-8d13-0010c6dffd0f',
-        '8d492954-c2cc-11de-8d13-0010c6dffd0f',
-      ]
+        class: ['8d4918b0-c2cc-11de-8d13-0010c6dffd0f', '8d492954-c2cc-11de-8d13-0010c6dffd0f'],
       },
     },
   },

diff --git a/src/registry/inbuilt-components/inbuiltDataSources.ts b/src/registry/inbuilt-components/inbuiltDataSources.ts
@@ -1,5 +1,4 @@
 import { DataSource } from '../../api/types';
-import { ClassArrayDataSource } from '../../datasources/class-array-datasource';
 import { ConceptDataSource } from '../../datasources/concept-data-source';
 import { LocationDataSource } from '../../datasources/location-data-source';
 import { RegistryItem } from '../registry';
@@ -18,8 +17,8 @@ export const inbuiltDataSources: Array<RegistryItem<DataSource<any>>> = [
   },
   {
     name: 'problem_datasource',
-    component: new ClassArrayDataSource(),
-  }
+    component: new ConceptDataSource(),
+  },
 ];
 
 export const validateInbuiltDatasource = (name: string) => {