Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Khp3 5427 from concept class to concept set v2 #35

Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/config-schema.ts
Original file line number Diff line number Diff line change
@@ -6,6 +6,11 @@ export const configSchema = {
_description: "Procedure Order type UUID",
_default: "4237a01f-29c5-4167-9d8e-96d6e590aa33",
},
procedureConceptSetUuid: {
_type: Type.String,
_description: "Procedure Concept SET UUID",
_default: "165418AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
},
testOrderTypeUuid: {
_type: Type.String,
_description: "Test Order type UUID",
@@ -34,6 +39,7 @@ export interface OrderReason {

export interface ConfigObject {
procedureOrderTypeUuid: string;
procedureConceptSetUuid: string;
testOrderTypeUuid: string;
labTestsWithOrderReasons: Array<OrderReason>;
showPrintButton: boolean;
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@ import { type ConfigObject } from "../../../config-schema";
import { type Concept } from "../api";

type ConceptResult = FetchResponse<Concept>;
type ConceptResults = FetchResponse<{ results: Array<Concept> }>;
type ConceptResults = FetchResponse<{ setMembers: Array<Concept> }>;

export interface ProceduresType {
label: string;
@@ -36,11 +36,12 @@ function openmrsFetchMultiple(urls: Array<string>) {

function useProceduresConceptsSWR(labOrderableConcepts?: Array<string>) {
console.warn("Here: ", labOrderableConcepts);
const config = useConfig<ConfigObject>();
const { data, isLoading, error } = useSWRImmutable(
() =>
labOrderableConcepts
? labOrderableConcepts.map((c) => `${restBaseUrl}/concept/${c}`)
: `${restBaseUrl}/concept?s=byConceptClass&conceptClass=8d490bf4-c2cc-11de-8d13-0010c6dffd0f`,
: `${restBaseUrl}/concept/${config.procedureConceptSetUuid}?v=custom:setMembers`,
(labOrderableConcepts ? openmrsFetchMultiple : openmrsFetch) as any,
{
shouldRetryOnError(err) {
@@ -53,7 +54,7 @@ function useProceduresConceptsSWR(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 {
Loading