Merge pull request #2122 from openmsupply/2023-mutate-patient-without-program-config

2023 mutate patient without program config

Author: clemens-msupply

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

@@ -1199,6 +1199,12 @@ export type ForeignKeyError = DeleteInboundShipmentLineErrorInterface & DeleteIn
   key: ForeignKey;
 };
 
+export type FormSchemaConnector = {
+  __typename: 'FormSchemaConnector';
+  nodes: Array<FormSchemaNode>;
+  totalCount: Scalars['Int']['output'];
+};
+
 export type FormSchemaFilterInput = {
   id?: InputMaybe<EqualFilterStringInput>;
   type?: InputMaybe<EqualFilterStringInput>;
@@ -1212,6 +1218,22 @@ export type FormSchemaNode = {
   uiSchema: Scalars['JSON']['output'];
 };
 
+export type FormSchemaResponse = FormSchemaConnector;
+
+export enum FormSchemaSortFieldInput {
+  Id = 'id'
+}
+
+export type FormSchemaSortInput = {
+  /**
+   * 	Sort query result is sorted descending or ascending (if not provided the default is
+   * ascending)
+   */
+  desc?: InputMaybe<Scalars['Boolean']['input']>;
+  /** Sort query result by `key` */
+  key: FormSchemaSortFieldInput;
+};
+
 export type FullSyncStatusNode = {
   __typename: 'FullSyncStatusNode';
   error?: Maybe<SyncErrorNode>;
@@ -1522,10 +1544,13 @@ export type InsertOutboundShipmentUnallocatedLineResponseWithId = {
 };
 
 export type InsertPatientInput = {
-  /** Patient document data */
-  data: Scalars['JSON']['input'];
-  /** The schema id used for the patient data */
-  schemaId: Scalars['String']['input'];
+  code: Scalars['String']['input'];
+  code2?: InputMaybe<Scalars['String']['input']>;
+  dateOfBirth?: InputMaybe<Scalars['NaiveDate']['input']>;
+  firstName?: InputMaybe<Scalars['String']['input']>;
+  gender?: InputMaybe<GenderInput>;
+  id: Scalars['String']['input'];
+  lastName?: InputMaybe<Scalars['String']['input']>;
 };
 
 export type InsertPatientResponse = PatientNode;
@@ -1590,6 +1615,15 @@ export type InsertProgramEnrolmentInput = {
 
 export type InsertProgramEnrolmentResponse = ProgramEnrolmentNode;
 
+export type InsertProgramPatientInput = {
+  /** Patient document data */
+  data: Scalars['JSON']['input'];
+  /** The schema id used for the patient data */
+  schemaId: Scalars['String']['input'];
+};
+
+export type InsertProgramPatientResponse = PatientNode;
+
 export type InsertProgramRequestRequisitionError = {
   __typename: 'InsertProgramRequestRequisitionError';
   error: InsertProgramRequestRequisitionErrorInterface;
@@ -2325,6 +2359,7 @@ export type Mutations = {
   insertOutboundShipmentLine: InsertOutboundShipmentLineResponse;
   insertOutboundShipmentServiceLine: InsertOutboundShipmentServiceLineResponse;
   insertOutboundShipmentUnallocatedLine: InsertOutboundShipmentUnallocatedLineResponse;
+  /** Inserts a new patient (without document data) */
   insertPatient: InsertPatientResponse;
   insertPrescription: InsertPrescriptionResponse;
   insertPrescriptionLine: InsertPrescriptionLineResponse;
@@ -2333,12 +2368,18 @@ export type Mutations = {
    * Every patient can only have one program document of each program type.
    */
   insertProgramEnrolment: InsertProgramEnrolmentResponse;
+  /**
+   * Inserts a new program patient, i.e. a patient that can contain additional information stored
+   * in a document.
+   */
+  insertProgramPatient: InsertProgramPatientResponse;
   insertProgramRequestRequisition: InsertProgramRequestRequisitionResponse;
   insertRepack: InsertRepackResponse;
   insertRequestRequisition: InsertRequestRequisitionResponse;
   insertRequestRequisitionLine: InsertRequestRequisitionLineResponse;
   insertStocktake: InsertStocktakeResponse;
   insertStocktakeLine: InsertStocktakeLineResponse;
+  /** Links a patient to a store and thus effectively to a site */
   linkPatientToStore: LinkPatientToStoreResponse;
   manualSync: Scalars['String']['output'];
   /** Set supply quantity to requested quantity */
@@ -2357,11 +2398,17 @@ export type Mutations = {
   updateOutboundShipmentName: UpdateOutboundShipmentNameResponse;
   updateOutboundShipmentServiceLine: UpdateOutboundShipmentServiceLineResponse;
   updateOutboundShipmentUnallocatedLine: UpdateOutboundShipmentUnallocatedLineResponse;
+  /** Updates a new patient (without document data) */
   updatePatient: UpdatePatientResponse;
   updatePrescription: UpdatePrescriptionResponse;
   updatePrescriptionLine: UpdatePrescriptionLineResponse;
   /** Updates an existing program document belonging to a patient. */
   updateProgramEnrolment: UpdateProgramEnrolmentResponse;
+  /**
+   * Updates a new program patient, i.e. a patient the can contain additional information stored
+   * in a document.
+   */
+  updateProgramPatient: UpdateProgramPatientResponse;
   updateRequestRequisition: UpdateRequestRequisitionResponse;
   updateRequestRequisitionLine: UpdateRequestRequisitionLineResponse;
   updateResponseRequisition: UpdateResponseRequisitionResponse;
@@ -2631,6 +2678,12 @@ export type MutationsInsertProgramEnrolmentArgs = {
 };
 
 
+export type MutationsInsertProgramPatientArgs = {
+  input: InsertProgramPatientInput;
+  storeId: Scalars['String']['input'];
+};
+
+
 export type MutationsInsertProgramRequestRequisitionArgs = {
   input: InsertProgramRequestRequisitionInput;
   storeId: Scalars['String']['input'];
@@ -2786,6 +2839,12 @@ export type MutationsUpdateProgramEnrolmentArgs = {
 };
 
 
+export type MutationsUpdateProgramPatientArgs = {
+  input: UpdateProgramPatientInput;
+  storeId: Scalars['String']['input'];
+};
+
+
 export type MutationsUpdateRequestRequisitionArgs = {
   input: UpdateRequestRequisitionInput;
   storeId: Scalars['String']['input'];
@@ -3339,7 +3398,7 @@ export type Queries = {
   documents: DocumentResponse;
   encounterFields: EncounterFieldsResponse;
   encounters: EncounterResponse;
-  formSchema?: Maybe<FormSchemaNode>;
+  formSchemas: FormSchemaResponse;
   /** Available without authorisation in operational and initialisation states */
   initialisationStatus: InitialisationStatusNode;
   insertPrescription: InsertPrescriptionResponse;
@@ -3499,8 +3558,10 @@ export type QueriesEncountersArgs = {
 };
 
 
-export type QueriesFormSchemaArgs = {
+export type QueriesFormSchemasArgs = {
   filter?: InputMaybe<FormSchemaFilterInput>;
+  page?: InputMaybe<PaginationInput>;
+  sort?: InputMaybe<Array<FormSchemaSortInput>>;
 };
 
 
@@ -4807,12 +4868,19 @@ export type UpdateOutboundShipmentUnallocatedLineResponseWithId = {
   response: UpdateOutboundShipmentUnallocatedLineResponse;
 };
 
+/**
+ * All fields in the input object will be used to update the patient record.
+ * This means that the caller also has to provide the fields that are not going to change.
+ * For example, if the last_name is not provided, the last_name in the patient record will be cleared.
+ */
 export type UpdatePatientInput = {
-  /** Patient document data */
-  data: Scalars['JSON']['input'];
-  parent: Scalars['String']['input'];
-  /** The schema id used for the patient data */
-  schemaId: Scalars['String']['input'];
+  code: Scalars['String']['input'];
+  code2?: InputMaybe<Scalars['String']['input']>;
+  dateOfBirth?: InputMaybe<Scalars['NaiveDate']['input']>;
+  firstName?: InputMaybe<Scalars['String']['input']>;
+  gender?: InputMaybe<GenderInput>;
+  id: Scalars['String']['input'];
+  lastName?: InputMaybe<Scalars['String']['input']>;
 };
 
 export type UpdatePatientResponse = PatientNode;
@@ -4886,6 +4954,16 @@ export type UpdateProgramEnrolmentInput = {
 
 export type UpdateProgramEnrolmentResponse = ProgramEnrolmentNode;
 
+export type UpdateProgramPatientInput = {
+  /** Patient document data */
+  data: Scalars['JSON']['input'];
+  parent: Scalars['String']['input'];
+  /** The schema id used for the patient data */
+  schemaId: Scalars['String']['input'];
+};
+
+export type UpdateProgramPatientResponse = PatientNode;
+
 export type UpdateRequestRequisitionError = {
   __typename: 'UpdateRequestRequisitionError';
   error: UpdateRequestRequisitionErrorInterface;

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

@@ -1,2 +1,3 @@
 export * from './common';
 export * from './useJsonForms';
+export * from './useDocumentFormData';

client/packages/programs/src/JsonForms/useDocumentLoader.ts client/packages/programs/src/JsonForms/useDocumentFormData.ts

@@ -2,29 +2,33 @@ import {
   useDocument,
   FormInputData,
   SchemaData,
+  JsonFormData,
 } from '@openmsupply-client/programs';
 import { useEffect, useState } from 'react';
-import { JsonData } from './common';
 
-export interface DocumentDataResponse {
-  isLoading: boolean;
-  error?: string;
-  documentId?: string;
-  data?: JsonData;
-  schema?: SchemaData;
-}
+export type SavedDocument = {
+  name: string;
+};
+
+export type SaveDocumentMutation = (
+  jsonData: unknown,
+  formSchemaId: string,
+  parent?: string
+) => Promise<SavedDocument>;
+
+export type DocumentFormData = JsonFormData<SavedDocument>;
 
-// eslint-disable-next-line valid-jsdoc
 /**
  * Manages the document data for a JSON form.
  * Data is taken either:
  * - from an api call (if the document already exist)
- * - from the createDoc (if the document is going to be created)
+ * - from the formInputData (e.g. if the document is going to be created)
  */
-export const useDocumentLoader = (
+export const useDocumentDataAccessor = (
   docName: string | undefined,
-  createDoc?: FormInputData
-): DocumentDataResponse => {
+  formInputData?: FormInputData,
+  handleSave?: SaveDocumentMutation
+): DocumentFormData => {
   const [error, setError] = useState<string | undefined>();
   // the current document id (undefined if its a new document)
   const [documentId, setDocumentId] = useState<string | undefined>();
@@ -68,18 +72,23 @@ export const useDocumentLoader = (
     }
   }, [databaseResponse]);
 
-  // user createDoc if there is one
+  // use schema from the formInputData if there is one
   useEffect(() => {
-    if (createDoc) {
-      setSchema(createDoc.schema);
+    if (formInputData) {
+      setSchema(formInputData.schema);
     }
-  }, [createDoc]);
+  }, [formInputData]);
 
   return {
     isLoading,
     error,
-    documentId,
-    data: createDoc?.data ?? databaseResponse?.data,
+    loadedData: formInputData?.data ?? databaseResponse?.data,
+    isCreating: formInputData?.isCreating ?? false,
     schema,
+    save: handleSave
+      ? async (data: unknown) => {
+          return await handleSave(data, schema.formSchemaId ?? '', documentId);
+        }
+      : undefined,
   };
 };