Merge pull request #6339 from msupply-foundation/6306-add-next-of-kin…

…-to-patient-edit

6306 add next of kin to patient edit

client/packages/common/src/types/schema.ts

@@ -928,6 +928,26 @@ export type CentralPatientSearchInput = {
 
 export type CentralPatientSearchResponse = CentralPatientSearchConnector | CentralPatientSearchError;
 
+export type CentralPluginMutations = {
+  __typename: 'CentralPluginMutations';
+  installUploadedPlugin: PluginInfoNode;
+};
+
+
+export type CentralPluginMutationsInstallUploadedPluginArgs = {
+  fileId: Scalars['String']['input'];
+};
+
+export type CentralPluginQueries = {
+  __typename: 'CentralPluginQueries';
+  uploadedPluginInfo: UploadedPluginInfoResponse;
+};
+
+
+export type CentralPluginQueriesUploadedPluginInfoArgs = {
+  fileId: Scalars['String']['input'];
+};
+
 export type CentralServerMutationNode = {
   __typename: 'CentralServerMutationNode';
   assetCatalogue: AssetCatalogueMutations;
@@ -936,9 +956,15 @@ export type CentralServerMutationNode = {
   general: CentralGeneralMutations;
   itemVariant: ItemVariantMutations;
   logReason: AssetLogReasonMutations;
+  plugins: CentralPluginMutations;
   vaccineCourse: VaccineCourseMutations;
 };
 
+export type CentralServerQueryNode = {
+  __typename: 'CentralServerQueryNode';
+  plugin: CentralPluginQueries;
+};
+
 export type CentralSyncRequired = AuthTokenErrorInterface & {
   __typename: 'CentralSyncRequired';
   description: Scalars['String']['output'];
@@ -2885,6 +2911,7 @@ export type InsertPatientInput = {
   id: Scalars['String']['input'];
   isDeceased?: InputMaybe<Scalars['Boolean']['input']>;
   lastName?: InputMaybe<Scalars['String']['input']>;
+  nextOfKinId?: InputMaybe<Scalars['String']['input']>;
   phone?: InputMaybe<Scalars['String']['input']>;
 };
 
@@ -5360,6 +5387,11 @@ export type PluginDataSortInput = {
   key: PluginDataSortFieldInput;
 };
 
+export type PluginInfoNode = {
+  __typename: 'PluginInfoNode';
+  backendPluginCodes: Array<Scalars['String']['output']>;
+};
+
 export type PluginNode = {
   __typename: 'PluginNode';
   config: Scalars['String']['output'];
@@ -5677,6 +5709,7 @@ export type Queries = {
   authToken: AuthTokenResponse;
   barcodeByGtin: BarcodeResponse;
   centralPatientSearch: CentralPatientSearchResponse;
+  centralServer: CentralServerQueryNode;
   clinicians: CliniciansResponse;
   /** Query omSupply "cold_storage_type" entries */
   coldStorageTypes: ColdStorageTypesResponse;
@@ -8328,6 +8361,7 @@ export type UpdatePatientInput = {
   id: Scalars['String']['input'];
   isDeceased?: InputMaybe<Scalars['Boolean']['input']>;
   lastName?: InputMaybe<Scalars['String']['input']>;
+  nextOfKinId?: InputMaybe<Scalars['String']['input']>;
   phone?: InputMaybe<Scalars['String']['input']>;
 };
 
@@ -8784,6 +8818,17 @@ export type UpdateVaccineCourseInput = {
 
 export type UpdateVaccineCourseResponse = UpdateVaccineCourseError | VaccineCourseNode;
 
+export type UploadedPluginError = {
+  __typename: 'UploadedPluginError';
+  error: UploadedPluginErrorVariant;
+};
+
+export enum UploadedPluginErrorVariant {
+  CannotParseFile = 'CANNOT_PARSE_FILE'
+}
+
+export type UploadedPluginInfoResponse = PluginInfoNode | UploadedPluginError;
+
 export type UpsertBundledItemError = {
   __typename: 'UpsertBundledItemError';
   error: UpsertBundledItemErrorInterface;

client/packages/programs/src/JsonForms/components/PatientSearch.tsx

@@ -0,0 +1,53 @@
+import React, { useEffect } from 'react';
+import { rankWith, ControlProps, uiTypeIs } from '@jsonforms/core';
+import { withJsonFormsControlProps } from '@jsonforms/react';
+import { Box, DetailInputWithLabelRow } from '@openmsupply-client/common';
+import { DefaultFormRowSx, FORM_GAP, FORM_LABEL_WIDTH } from '../common';
+import {
+  PatientSearchInput,
+  SearchInputPatient,
+  usePatient,
+} from '@openmsupply-client/system';
+
+export const patientSearchTester = rankWith(10, uiTypeIs('PatientSearch'));
+
+const UIComponent = (props: ControlProps) => {
+  const { data, handleChange, label, path } = props;
+
+  const [patient, setPatient] = React.useState<SearchInputPatient | null>(null);
+
+  const onChangePatient = async (patient: SearchInputPatient) => {
+    setPatient(patient);
+    handleChange(path, patient.id);
+  };
+
+  const { data: patientData } = usePatient.document.get(data);
+
+  useEffect(() => {
+    if (!patientData) return;
+    setPatient(patientData);
+  }, [patientData]);
+
+  return (
+    <DetailInputWithLabelRow
+      sx={DefaultFormRowSx}
+      label={label}
+      labelWidthPercentage={FORM_LABEL_WIDTH}
+      inputAlignment={'start'}
+      Input={
+        <Box display="flex" alignItems="center" gap={FORM_GAP} width="100%">
+          <PatientSearchInput value={patient} onChange={onChangePatient} />
+        </Box>
+      }
+    />
+  );
+};
+
+const UIComponentWrapper = (props: ControlProps) => {
+  if (!props.visible) {
+    return null;
+  }
+  return <UIComponent {...props} />;
+};
+
+export const PatientSearch = withJsonFormsControlProps(UIComponentWrapper);

client/packages/programs/src/JsonForms/components/index.ts

@@ -10,4 +10,5 @@ export * from './Search/Search';
 export * from './ProgramEvent';
 export * from './HistoricEncounterData';
 export * from './BloodPressure';
+export * from './PatientSearch';
 export * from './Prescription/Prescription';

client/packages/programs/src/JsonForms/useJsonFormsHandler.tsx

@@ -37,6 +37,8 @@ import {
   BloodPressure,
   Prescription,
   prescriptionTester,
+  patientSearchTester,
+  PatientSearch,
 } from './components';
 import { EnrolmentId, enrolmentIdTester } from './components/EnrolmentId';
 import {
@@ -83,6 +85,7 @@ const additionalRenderers: JsonFormsRendererRegistryEntry[] = [
   { tester: enrolmentIdTester, renderer: EnrolmentId },
   { tester: bloodPressureTester, renderer: BloodPressure },
   { tester: prescriptionTester, renderer: Prescription },
+  { tester: patientSearchTester, renderer: PatientSearch },
 ];
 
 /**

client/packages/system/src/Patient/PatientView/DefaultPatientSchema.json

@@ -52,6 +52,10 @@
         "phone": {
           "description": "Phone number",
           "type": "string"
+        },
+        "nextOfKinId": {
+          "description": "ID of the mSupply name record for the patient's next of kin",
+          "type": "string"
         }
       },
       "required": ["id", "code", "firstName", "lastName"],

client/packages/system/src/Patient/PatientView/DefaultPatientUISchema.json

@@ -73,6 +73,11 @@
           "type": "Control",
           "scope": "#/properties/phone",
           "label": "Phone"
+        },
+        {
+          "type": "PatientSearch",
+          "scope": "#/properties/nextOfKinId",
+          "label": "Next of Kin"
         }
       ]
     }

client/packages/system/src/Patient/PatientView/PatientView.tsx

@@ -164,6 +164,7 @@ const PatientDetailView = ({
           isDeceased: currentPatient.isDeceased ?? undefined,
           phone: currentPatient.phone ?? undefined,
           address1: currentPatient.address1 ?? undefined,
+          nextOfKinId: currentPatient.nextOfKinId ?? undefined,
         },
         isCreating: false,
       };