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

OHRI-2053 CaCx - update metadata to use config instead of constants #1736

Merged
Show file tree
Hide file tree
Changes from 2 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
34 changes: 34 additions & 0 deletions packages/esm-cervical-cancer-app/src/config-schema.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
import { Type } from '@openmrs/esm-framework';

export const configSchema = {
encounterTypes: {
_type: Type.Object,
_description: 'Encounter type UUIDs for Cacx.',
_default: {
cacxRegistrationEncounterType_UUID: '3eb24129-9f7d-4372-a14e-c2cf577e5db1',
cacxTreatmentEncounterType_UUID: '60c80941-c3dc-45c6-9b78-c150e0470cbd',
},
},
obsConcepts: {
_type: Type.Object,
_description: 'List of observation concept UUIDs related to Cacx.',
_default: {
cervicalCancerScreeningDateConcept: '2f256b46-395b-40f8-b93e-3ea68e5531bc',
previouslyScreenedConcept: '7cf4c96a-3e68-4ca5-9b49-9148adc6263d',
eligibleForScreeningConcept: 'b77ef6d3-4895-4e88-8b17-fa4aff6eba59',
cacxEncounterDateConcept: '163137AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',
screeningMethodConcept: '53ff5cd0-0f37-4190-87b1-9eb439a15e94',
cacxTreatmentConcept: '3a8bb4b4-7496-415d-a327-57ae3711d4eb',
colopsyResultsConcept: '9096a18e-c009-4f4c-b0ba-0605e0f16578',
humanPapilomaVirusResultsConcept: '159859AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',
papanicolaouSmearResultsConcept: '28bab50e-7ff7-4216-81be-3f7ad05c6547',
VIAProcedureResultsConcept: 'cc647244-0826-4d8e-8c5a-d7a371267bf4',
},
},
};

export interface ConfigObject {
identifiers: Object;
encounterTypes: Object;
obsConcepts: Object;
}
15 changes: 0 additions & 15 deletions packages/esm-cervical-cancer-app/src/constants.ts
Original file line number Diff line number Diff line change
@@ -1,15 +0,0 @@
//cacx registration
export const cacxRegistrationEncounterType_UUID = '3eb24129-9f7d-4372-a14e-c2cf577e5db1';
export const cervicalCancerScreeningDateConcept = '2f256b46-395b-40f8-b93e-3ea68e5531bc';
export const previouslyScreenedConcept = '7cf4c96a-3e68-4ca5-9b49-9148adc6263d';
export const eligibleForScreeningConcept = 'b77ef6d3-4895-4e88-8b17-fa4aff6eba59';

//cacx treatment
export const cacxTreatmentEncounterType_UUID = '60c80941-c3dc-45c6-9b78-c150e0470cbd';
export const cacxEncounterDateConcept = '163137AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
export const screeningMethodConcept = '53ff5cd0-0f37-4190-87b1-9eb439a15e94';
export const cacxTreatmentConcept = '3a8bb4b4-7496-415d-a327-57ae3711d4eb';
export const colopsyResultsConcept = '9096a18e-c009-4f4c-b0ba-0605e0f16578';
export const humanPapilomaVirusResultsConcept = '159859AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
export const papanicolaouSmearResultsConcept = '28bab50e-7ff7-4216-81be-3f7ad05c6547';
export const VIAProcedureResultsConcept = 'cc647244-0826-4d8e-8c5a-d7a371267bf4';
3 changes: 2 additions & 1 deletion packages/esm-cervical-cancer-app/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { caCxSummaryDashboardMeta, caCxVisitsDashboardMeta, cervicalCancerFolder
import { createDashboardGroup, createDashboardLink } from '@openmrs/esm-patient-common-lib';
import CacxSummaryList from './views/cacx-summary/cacx-summary.component';
import CacxVisitServices from './views/cacx-visits/cacx-visits-services.component';
import { configSchema } from './config-schema';

export const importTranslation = require.context('../translations', false, /.json$/, 'lazy');

Expand All @@ -16,7 +17,7 @@ const options = {
};

export function startupApp() {
defineConfigSchema(moduleName, {});
defineConfigSchema(moduleName, configSchema);
}

export const cacxPatientChartDashboard = getSyncLifecycle(createDashboardGroup(cervicalCancerFolderMeta), options);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,8 @@
import React, { useMemo } from 'react';
import { useTranslation } from 'react-i18next';
import { EncounterList, EncounterListColumn, getObsFromEncounter } from '@ohri/openmrs-esm-ohri-commons-lib';
import {
cacxRegistrationEncounterType_UUID,
cervicalCancerScreeningDateConcept,
eligibleForScreeningConcept,
previouslyScreenedConcept,
} from '../../../constants';
import { moduleName } from '../../../index';
import { useConfig } from '@openmrs/esm-framework';

interface CacxRegistrationProps {
patientUuid: string;
Expand All @@ -16,6 +11,13 @@ interface CacxRegistrationProps {
export const CacxRegistration: React.FC<CacxRegistrationProps> = ({ patientUuid }) => {
const { t } = useTranslation();

const config = useConfig();

const { cervicalCancerScreeningDateConcept, eligibleForScreeningConcept, previouslyScreenedConcept } =
config.obsConcepts;

const { cacxRegistrationEncounterType_UUID } = config.encounterTypes;

const columnsLab: EncounterListColumn[] = useMemo(
() => [
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,24 +6,28 @@ import {
getMultipleObsFromEncounter,
getObsFromEncounter,
} from '@ohri/openmrs-esm-ohri-commons-lib';
import {
cacxEncounterDateConcept,
screeningMethodConcept,
cacxTreatmentConcept,
cacxTreatmentEncounterType_UUID,
colopsyResultsConcept,
humanPapilomaVirusResultsConcept,
papanicolaouSmearResultsConcept,
VIAProcedureResultsConcept,
} from '../../../constants';
import { moduleName } from '../../../index';
import { useConfig } from '@openmrs/esm-framework';

interface CacxTreatmentProps {
patientUuid: string;
}

export const CacxTreatment: React.FC<CacxTreatmentProps> = ({ patientUuid }) => {
const { t } = useTranslation();
const config = useConfig();

const {
cacxEncounterDateConcept,
screeningMethodConcept,
cacxTreatmentConcept,
colopsyResultsConcept,
humanPapilomaVirusResultsConcept,
papanicolaouSmearResultsConcept,
VIAProcedureResultsConcept,
} = config.obsConcepts;

const { cacxTreatmentEncounterType_UUID } = config.encounterTypes;

const columnsLab: EncounterListColumn[] = useMemo(
() => [
Expand Down