Merge pull request #2131 from openmsupply/2023-rework-form-schema-list-endpoint

Mutate patient follow ups

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>;
@@ -2347,7 +2369,7 @@ export type Mutations = {
    */
   insertProgramEnrolment: InsertProgramEnrolmentResponse;
   /**
-   * Inserts a new program patient, i.e. a patient the can contain additional information stored
+   * Inserts a new program patient, i.e. a patient that can contain additional information stored
    * in a document.
    */
   insertProgramPatient: InsertProgramPatientResponse;
@@ -3376,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;
@@ -3536,8 +3558,10 @@ export type QueriesEncountersArgs = {
 };
 
 
-export type QueriesFormSchemaArgs = {
+export type QueriesFormSchemasArgs = {
   filter?: InputMaybe<FormSchemaFilterInput>;
+  page?: InputMaybe<PaginationInput>;
+  sort?: InputMaybe<Array<FormSchemaSortInput>>;
 };
 
 
@@ -4844,6 +4868,11 @@ 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 = {
   code: Scalars['String']['input'];
   code2?: InputMaybe<Scalars['String']['input']>;

client/packages/programs/src/api/api.ts

@@ -360,16 +360,12 @@ export const getClinicianQueries = (sdk: Sdk, storeId: string) => ({
 export const getFormSchemaQueries = (sdk: Sdk) => ({
   get: {
     byType: async (type: string): Promise<FormSchemaFragment | undefined> => {
-      const result = await sdk.formSchema({
+      const result = await sdk.formSchemas({
         filter: { type: { equalTo: type } },
       });
 
-      if (!result.formSchema) {
-        return undefined;
-      }
-
-      if (result.formSchema?.__typename === 'FormSchemaNode') {
-        return result.formSchema;
+      if (result.formSchemas?.__typename === 'FormSchemaConnector') {
+        return result.formSchemas.nodes[0];
       }
 
       throw new Error('Error querying form schema');

client/packages/programs/src/api/operations.generated.ts

@@ -178,12 +178,12 @@ export type CliniciansQuery = { __typename: 'Queries', clinicians: { __typename:
 
 export type FormSchemaFragment = { __typename: 'FormSchemaNode', id: string, jsonSchema: any, type: string, uiSchema: any };
 
-export type FormSchemaQueryVariables = Types.Exact<{
+export type FormSchemasQueryVariables = Types.Exact<{
   filter?: Types.InputMaybe<Types.FormSchemaFilterInput>;
 }>;
 
 
-export type FormSchemaQuery = { __typename: 'Queries', formSchema?: { __typename: 'FormSchemaNode', id: string, jsonSchema: any, type: string, uiSchema: any } | null };
+export type FormSchemasQuery = { __typename: 'Queries', formSchemas: { __typename: 'FormSchemaConnector', nodes: Array<{ __typename: 'FormSchemaNode', id: string, jsonSchema: any, type: string, uiSchema: any }> } };
 
 export type ActiveProgramEventsQueryVariables = Types.Exact<{
   at?: Types.InputMaybe<Types.Scalars['String']['input']>;
@@ -603,11 +603,16 @@ export const CliniciansDocument = gql`
   }
 }
     ${ClinicianFragmentDoc}`;
-export const FormSchemaDocument = gql`
-    query formSchema($filter: FormSchemaFilterInput) {
-  formSchema(filter: $filter) {
-    __typename
-    ...FormSchema
+export const FormSchemasDocument = gql`
+    query formSchemas($filter: FormSchemaFilterInput) {
+  formSchemas(filter: $filter) {
+    ... on FormSchemaConnector {
+      __typename
+      nodes {
+        __typename
+        ...FormSchema
+      }
+    }
   }
 }
     ${FormSchemaFragmentDoc}`;
@@ -690,8 +695,8 @@ export function getSdk(client: GraphQLClient, withWrapper: SdkFunctionWrapper =
     clinicians(variables: CliniciansQueryVariables, requestHeaders?: GraphQLClientRequestHeaders): Promise<CliniciansQuery> {
       return withWrapper((wrappedRequestHeaders) => client.request<CliniciansQuery>(CliniciansDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'clinicians', 'query');
     },
-    formSchema(variables?: FormSchemaQueryVariables, requestHeaders?: GraphQLClientRequestHeaders): Promise<FormSchemaQuery> {
-      return withWrapper((wrappedRequestHeaders) => client.request<FormSchemaQuery>(FormSchemaDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'formSchema', 'query');
+    formSchemas(variables?: FormSchemasQueryVariables, requestHeaders?: GraphQLClientRequestHeaders): Promise<FormSchemasQuery> {
+      return withWrapper((wrappedRequestHeaders) => client.request<FormSchemasQuery>(FormSchemasDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'formSchemas', 'query');
     },
     activeProgramEvents(variables: ActiveProgramEventsQueryVariables, requestHeaders?: GraphQLClientRequestHeaders): Promise<ActiveProgramEventsQuery> {
       return withWrapper((wrappedRequestHeaders) => client.request<ActiveProgramEventsQuery>(ActiveProgramEventsDocument, variables, {...requestHeaders, ...wrappedRequestHeaders}), 'activeProgramEvents', 'query');
@@ -993,16 +998,16 @@ export const mockCliniciansQuery = (resolver: ResponseResolver<GraphQLRequest<Cl
  * @param resolver a function that accepts a captured request and may return a mocked response.
  * @see https://mswjs.io/docs/basics/response-resolver
  * @example
- * mockFormSchemaQuery((req, res, ctx) => {
+ * mockFormSchemasQuery((req, res, ctx) => {
  *   const { filter } = req.variables;
  *   return res(
- *     ctx.data({ formSchema })
+ *     ctx.data({ formSchemas })
  *   )
  * })
  */
-export const mockFormSchemaQuery = (resolver: ResponseResolver<GraphQLRequest<FormSchemaQueryVariables>, GraphQLContext<FormSchemaQuery>, any>) =>
-  graphql.query<FormSchemaQuery, FormSchemaQueryVariables>(
-    'formSchema',
+export const mockFormSchemasQuery = (resolver: ResponseResolver<GraphQLRequest<FormSchemasQueryVariables>, GraphQLContext<FormSchemasQuery>, any>) =>
+  graphql.query<FormSchemasQuery, FormSchemasQueryVariables>(
+    'formSchemas',
     resolver
   )
 

client/packages/programs/src/api/operations.graphql

@@ -430,10 +430,15 @@ fragment FormSchema on FormSchemaNode {
   uiSchema
 }
 
-query formSchema($filter: FormSchemaFilterInput) {
-  formSchema(filter: $filter) {
-    __typename
-    ...FormSchema
+query formSchemas($filter: FormSchemaFilterInput) {
+  formSchemas(filter: $filter) {
+    ... on FormSchemaConnector {
+      __typename
+      nodes {
+        __typename
+        ...FormSchema
+      }
+    }
   }
 }
 

client/packages/system/src/Patient/CreatePatientModal/DefaultCreatePatientJsonForm.ts

@@ -7,9 +7,12 @@ import {
   usePatientStore,
 } from '@openmsupply-client/programs';
 import { PatientPanel } from './PatientPanel';
-import { createPatient, createPatientUI } from './DefaultCreatePatientJsonForm';
 import { ObjUtils } from '@common/utils';
 
+import defaultPatientSchema from '../DefaultPatientSchema.json';
+import defaultPatientUISchema from '../DefaultPatientUISchema.json';
+import { BasicSpinner } from '@openmsupply-client/common';
+
 type Patient = {
   code?: string;
   code2?: string;
@@ -49,12 +52,14 @@ export const PatientFormTab: FC<PatientPanel> = ({ patient, value }) => {
     }
   };
 
+  if (isLoading) return <BasicSpinner />;
+
   return (
     <PatientPanel value={value} patient={patient}>
       <JsonForm
         data={(patient as JsonData) || {}}
-        jsonSchema={patientCreationUI?.jsonSchema || createPatient}
-        uiSchema={patientCreationUI?.uiSchema || createPatientUI}
+        jsonSchema={patientCreationUI?.jsonSchema || defaultPatientSchema}
+        uiSchema={patientCreationUI?.uiSchema || defaultPatientUISchema}
         isError={patientCreationUI ? isError : false}
         isLoading={patientCreationUI ? isLoading : false}
         updateData={setPatient}

client/packages/system/src/Patient/CreatePatientModal/PatientFormTab.tsx

@@ -22,7 +22,8 @@
         },
         "code": {
           "description": "Patient code, e.g. national id or other patient identifier",
-          "type": "string"
+          "type": "string",
+          "minLength": 1
         },
         "code2": {
           "description": "Secondary patient code, e.g. another type of health id",

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

@@ -10,6 +10,7 @@ import {
   useAuthContext,
   InsertPatientInput,
   UpdatePatientInput,
+  BasicSpinner,
 } from '@openmsupply-client/common';
 import { usePatient } from '../api';
 import { AppBarButtons } from './AppBarButtons';
@@ -33,8 +34,8 @@ import {
 } from '@openmsupply-client/programs';
 import { Footer } from './Footer';
 
-import defaultPatientSchema from './DefaultPatientSchema.json';
-import defaultPatientUISchema from './DefaultPatientUISchema.json';
+import defaultPatientSchema from '../DefaultPatientSchema.json';
+import defaultPatientUISchema from '../DefaultPatientUISchema.json';
 
 const DEFAULT_SCHEMA: SchemaData = {
   formSchemaId: undefined,
@@ -96,7 +97,7 @@ const PatientDetailView = ({
   const patientId = usePatient.utils.id();
   const { data: currentPatient } = usePatient.document.get(patientId);
 
-  const { data: patientRegistries } =
+  const { data: patientRegistries, isLoading } =
     useDocumentRegistry.get.documentRegistries({
       filter: {
         documentType: { equalTo: 'Patient' },
@@ -199,6 +200,8 @@ const PatientDetailView = ({
     title: t('heading.are-you-sure'),
   });
 
+  if (isLoading) return <BasicSpinner />;
+
   return (
     <Box flex={1} display="flex" justifyContent="center">
       <Box style={{ maxWidth: 1200, flex: 1 }}>{JsonForm}</Box>