@openmrs/esm-form-engine-lib 3.2.0 → 3.3.0

package/src/processors/encounter/encounter-processor-helper.ts

@@ -1,4 +1,5 @@
 import {
+  type AttachmentFieldValue,
   type FormField,
   type FormProcessorContextProps,
   type OpenmrsEncounter,
@@ -7,7 +8,7 @@ import {
   type PatientProgram,
   type PatientProgramPayload,
 } from '../../types';
-import { saveAttachment, savePatientIdentifier, saveProgramEnrollment } from '../../api';
+import { createAttachment, savePatientIdentifier, saveProgramEnrollment } from '../../api';
 import { hasRendering, hasSubmission } from '../../utils/common-utils';
 import dayjs from 'dayjs';
 import { assignedObsIds, constructObs, voidObs } from '../../adapters/obs-adapter';
@@ -144,19 +145,17 @@ export function savePatientPrograms(patientPrograms: PatientProgramPayload[]) {
 export function saveAttachments(fields: FormField[], encounter: OpenmrsEncounter, abortController: AbortController) {
   const complexFields = fields?.filter((field) => field?.questionOptions.rendering === 'file' && hasSubmission(field));
 
-  if (!complexFields?.length) return [];
+  if (!complexFields?.length) {
+    return [];
+  }
 
-  return complexFields.map((field) => {
+  const allPromises = complexFields.flatMap((field) => {
     const patientUuid = typeof encounter?.patient === 'string' ? encounter?.patient : encounter?.patient?.uuid;
-    return saveAttachment(
-      patientUuid,
-      field,
-      field?.questionOptions.concept,
-      new Date().toISOString(),
-      encounter?.uuid,
-      abortController,
-    );
+    const attachments = (field.meta.submission.newValue as AttachmentFieldValue[]) ?? [];
+    return attachments.map((attachment) => createAttachment(patientUuid, encounter.uuid, attachment));
   });
+
+  return Promise.all(allPromises);
 }
 
 export function getMutableSessionProps(context: FormContextProps) {
@@ -199,11 +198,14 @@ function processObsField(obsForSubmission: OpenmrsObs[], field: FormField) {
 
   if (field.type === 'obsGroup') {
     processObsGroup(obsForSubmission, field);
-  } else if (hasSubmission(field)) {
-    // For non-group obs with a submission
+    return;
+  }
+
+  // new attachments will be processed later
+  if (!hasRendering(field, 'file')) {
     addObsToList(obsForSubmission, field.meta.submission.newValue);
-    addObsToList(obsForSubmission, field.meta.submission.voidedValue);
   }
+  addObsToList(obsForSubmission, field.meta.submission.voidedValue);
 }
 
 function processObsGroup(obsForSubmission: OpenmrsObs[], groupField: FormField) {
@@ -257,7 +259,7 @@ function hasSubmittableObs(field: FormField) {
     type,
   } = field;
 
-  if (isTransient || !['obs', 'obsGroup'].includes(type) || hasRendering(field, 'file') || field.meta.groupId) {
+  if (isTransient || !['obs', 'obsGroup'].includes(type) || field.meta.groupId) {
     return false;
   }
   if ((field.isHidden || field.isParentHidden) && field.meta.initialValue?.omrsObject) {

package/src/registry/registry.ts

@@ -16,6 +16,7 @@ import { getControlTemplate } from './inbuilt-components/control-templates';
 import { inbuiltPostSubmissionActions } from './inbuilt-components/InbuiltPostSubmissionActions';
 import { inbuiltFormTransformers } from './inbuilt-components/inbuiltTransformers';
 import { inbuiltFieldValueAdapters } from './inbuilt-components/inbuiltFieldValueAdapters';
+import { hasRendering } from '../utils/common-utils';
 
 /**
  * @internal
@@ -143,7 +144,7 @@ export async function getRegisteredControl(renderType: string) {
  */
 export function getFieldControlWithFallback(question: FormField) {
   // Check if the question has a missing concept
-  if (hasMissingConcept(question)) {
+  if (hasMissingConcept(question) && !hasRendering(question, 'file')) {
     // If so, render a disabled text input
     question.disabled = true;
     question.isDisabled = true;

package/src/types/domain.ts

@@ -1,4 +1,4 @@
-import { type OpenmrsResource } from '@openmrs/esm-framework';
+import { type UploadedFile, type OpenmrsResource } from '@openmrs/esm-framework';
 
 export interface OpenmrsEncounter {
   uuid?: string;
@@ -108,14 +108,14 @@ export interface OpenmrsFormResource extends OpenmrsResource {
   valueReference?: string;
 }
 
-export interface Attachment {
-  id: string;
-  src: string;
-  title: string;
-  description: string;
-  dateTime: string;
-  bytesMimeType: string;
-  bytesContentFamily: string;
+export interface Attachment extends UploadedFile {
+  uuid?: string;
+  voided?: boolean;
+}
+
+export interface AttachmentFieldValue extends Attachment {
+  formFieldNamespace: string;
+  formFieldPath: string;
 }
 
 export interface AttachmentResponse {

package/src/types/index.ts

@@ -118,8 +118,8 @@ export interface PostSubmissionAction {
   ): void;
 }
 
-export interface FormFieldInputProps {
-  value: any;
+export interface FormFieldInputProps<TValue = any> {
+  value: TValue;
   field: FormField;
   errors: ValidationResult[];
   warnings: ValidationResult[];
@@ -128,7 +128,7 @@ export interface FormFieldInputProps {
    *
    * @param value - The new value of the field.
    */
-  setFieldValue: (value: any) => void;
+  setFieldValue: (value: TValue) => void;
 }
 
 /**

package/src/components/inputs/file/camera/camera.component.tsx

@@ -1,34 +0,0 @@
-import React from 'react';
-import Webcam from 'react-webcam';
-import { Button } from '@carbon/react';
-import { Camera as CameraIcon } from '@carbon/react/icons';
-
-import styles from './camera.scss';
-
-interface CameraProps {
-  handleImages: (state: any) => void;
-}
-
-const Camera: React.FC<CameraProps> = ({ handleImages }) => {
-  const webcamRef = React.useRef(null);
-
-  const capture = React.useCallback(() => {
-    const imageSrc = webcamRef.current.getScreenshot();
-    handleImages(imageSrc);
-  }, [webcamRef]);
-
-  const videoConstraints = {
-    facingMode: 'user',
-  };
-
-  return (
-    <div>
-      <Webcam audio={false} ref={webcamRef} screenshotFormat="image/png" videoConstraints={videoConstraints} />
-      <div className={styles.captureButton}>
-        <Button onClick={capture} type="button" hasIconOnly renderIcon={() => <CameraIcon size={24} />}></Button>
-      </div>
-    </div>
-  );
-};
-
-export default Camera;

package/src/components/inputs/file/camera/camera.scss

@@ -1,3 +0,0 @@
-.captureButton {
-  margin: 0.5rem 0;
-}