Merge pull request #66 from PatrickWaweru/KHP3-5427-FromConceptClassT…

…oConceptSet-V2 Khp3 5427 from concept class to concept set v2
palladiumkenya · Apr 17, 2024 · 751b941 · 751b941
2 parents 975fd6e + d1adfc9
commit 751b941
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/src/config-schema.ts b/src/config-schema.ts
@@ -1,6 +1,11 @@
 import { Type } from "@openmrs/esm-framework";
 
 export const configSchema = {
+  radiologyConceptSetUuid: {
+    _type: Type.String,
+    _description: "Radiology Concept SET UUID",
+    _default: "164068AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+  },
   orders: {
     labOrderTypeUuid: {
       _type: Type.UUID,
@@ -25,6 +30,7 @@ interface OrderReason {
   orderReasons: Array<string>;
 }
 export type RadiologyConfig = {
+  radiologyConceptSetUuid: string;
   orders: {
     labOrderTypeUuid: string;
     labOrderableConcepts: Array<string>;

diff --git a/src/form/radiology-orders/add-radiology-order/useRadiologyTypes.ts b/src/form/radiology-orders/add-radiology-order/useRadiologyTypes.ts
@@ -12,7 +12,7 @@ import { type Concept } from "../../../types";
 import { type RadiologyConfig } from "../../../config-schema";
 
 type ConceptResult = FetchResponse<Concept>;
-type ConceptResults = FetchResponse<{ results: Array<Concept> }>;
+type ConceptResults = FetchResponse<{ setMembers: Array<Concept> }>;
 
 export interface RadiologyType {
   label: string;
@@ -35,11 +35,12 @@ function openmrsFetchMultiple(urls: Array<string>) {
 }
 
 function useRadiologyConceptsSWR(labOrderableConcepts?: Array<string>) {
+  const config = useConfig<RadiologyConfig>();
   const { data, isLoading, error } = useSWRImmutable(
     () =>
       labOrderableConcepts
         ? labOrderableConcepts.map((c) => `${restBaseUrl}/concept/${c}`)
-        : `${restBaseUrl}/concept?s=byConceptClass&conceptClass=8caa332c-efe4-4025-8b18-3398328e1323`,
+        : `${restBaseUrl}/concept/${config.radiologyConceptSetUuid}?v=custom:setMembers`,
     (labOrderableConcepts ? openmrsFetchMultiple : openmrsFetch) as any,
     {
       shouldRetryOnError(err) {
@@ -52,7 +53,7 @@ function useRadiologyConceptsSWR(labOrderableConcepts?: Array<string>) {
     if (isLoading || error) return null;
     return labOrderableConcepts
       ? (data as Array<ConceptResult>)?.flatMap((d) => d.data.setMembers)
-      : (data as ConceptResults)?.data.results ?? ([] as Concept[]);
+      : (data as ConceptResults)?.data.setMembers ?? ([] as Concept[]);
   }, [data, isLoading, error]);
 
   return {