@kenyaemr/esm-patient-clinical-view-app 5.4.2-pre.2223 → 5.4.2-pre.2234

package/dist/routes.json

@@ -1 +1 @@
-{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"kenyaemr":"^19.0.0"},"pages":[],"extensions":[{"name":"clinical-view-section","component":"clinicalViewPatientDashboard","slot":"patient-chart-dashboard-slot"},{"name":"family-history","slot":"patient-chart-family-history-slot","component":"familyHistory","order":0,"online":true,"offline":false},{"name":"relationships-link","component":"relationshipsLink","slot":"patient-chart-dashboard-slot","order":14,"meta":{"columns":1,"columnSpan":1,"slot":"patient-chart-relationships-slot","path":"relationships","layoutMode":"anchored"}},{"name":"relationships","slot":"patient-chart-relationships-slot","component":"relationships","order":0,"online":true,"offline":false},{"name":"contact-list-form","component":"contactListForm"},{"name":"maternal-and-child-health-dashboard-group-link","slot":"clinical-view-section","component":"maternalAndChildHealthSideNavGroup"},{"name":"antenatal-care-dashboard-link","component":"antenatalCareLink","slot":"maternal-and-child-health-slot","meta":{"columns":1,"columnSpan":1,"slot":"patient-chart-antenatal-care-dashboard-slot","path":"antenatal-care-dashboard","layoutMode":"anchored"}},{"name":"antenatal-care-dashboard","slot":"patient-chart-antenatal-care-dashboard-slot","component":"antenatalCare"},{"name":"postnatal-care-dashboard-link","component":"postnatalCareLink","slot":"maternal-and-child-health-slot","meta":{"columns":1,"columnSpan":1,"slot":"patient-chart-postnatal-care-dashboard-slot","path":"postnatal-care-dashboard","layoutMode":"anchored"}},{"name":"postnatal-care-dashboard","slot":"patient-chart-postnatal-care-dashboard-slot","component":"postnatalCare"},{"name":"labour-and-delivery-dashboard-link","component":"labourAndDeliveryLink","slot":"maternal-and-child-health-slot","meta":{"fullWidth":true,"slot":"patient-chart-labour-and-delivery-dashboard-slot","path":"labour-and-delivery-dashboard","layoutMode":"anchored"}},{"name":"labour-and-delivery-dashboard","slot":"patient-chart-labour-and-delivery-dashboard-slot","component":"labourAndDelivery","meta":{"fullWidth":true}},{"name":"hiv-care-and-treatment-dashboard-group-link","slot":"special-clinics-slot","component":"hivCareAndTreatMentSideNavGroup"},{"name":"genericNavLinks","slot":"special-clinics-slot","component":"genericNavLinks","meta":{"columns":1,"columnSpan":1,"slot":"patient-chart-special-clinic-dashboard-slot","path":"special-clinics-dashboard","layoutMode":"anchored"}},{"name":"patient-chart-special-clinic-dashboard-slot","slot":"patient-chart-special-clinic-dashboard-slot","component":"genericDashboard"},{"name":"hts-dashboard-link","component":"htsDashboardLink","slot":"hiv-care-and-treatment-slot","meta":{"columns":1,"columnSpan":1,"slot":"patient-chart-hts-dashboard-slot","path":"hts-dashboard","layoutMode":"anchored"}},{"name":"hts-clinical-view","slot":"patient-chart-hts-dashboard-slot","component":"htsClinicalView","order":2,"online":true,"offline":false},{"name":"defaulter-tracing-dashboard-link","component":"defaulterTracingLink","slot":"hiv-care-and-treatment-slot","meta":{"columns":1,"columnSpan":1,"slot":"patient-chart-defaulter-tracing-dashboard-slot","path":"defaulter-tracing-dashboard","layoutMode":"anchored"}},{"name":"defaulter-tracing-dashboard","slot":"patient-chart-defaulter-tracing-dashboard-slot","component":"defaulterTracing","order":3,"online":true,"offline":false},{"name":"special-clinics-dashboard-group-link","slot":"clinical-view-section","component":"specialClinicsSideNavGroup"},{"name":"clinical-encounter-link","component":"inPatientClinicalEncounterLink","slot":"clinical-view-section","order":40,"meta":{"columns":1,"columnSpan":1,"slot":"patient-chart-clinical-encounter-slot","path":"clinical-encounter","layoutMode":"anchored"}},{"name":"clinical-encounter","slot":"patient-chart-clinical-encounter-slot","component":"inPatientClinicalEncounter","order":0,"online":true,"offline":false},{"component":"caseManagementDashboardLink","name":"case-management-dashboard-link","meta":{"name":"case-management","title":"Case Management","slot":"case-management-dashboard-slot","path":"/case-management"}},{"name":"in-patient-dashboard-link","component":"inPatientChartLink","slot":"patient-chart-dashboard-slot","order":7,"meta":{"slot":"patient-chart-in-patient-dashboard-slot","path":"in-patient","layoutMode":"anchored","columns":1,"columnSpan":1}},{"name":"in-patient-dashboard","slot":"patient-chart-in-patient-dashboard-slot","component":"inPatientChartDashboard","meta":{"fullWidth":false}},{"name":"wrap-component-view","slot":"case-management-dashboard-slot","component":"wrapComponent","order":2,"online":true,"offline":false},{"name":"case-encounter-link","component":"caseEncounterDashboardLink","slot":"patient-chart-dashboard-slot","order":14,"meta":{"columns":1,"columnSpan":1,"slot":"patient-chart-case-encounter-slot","path":"case-management-encounters","layoutMode":"anchored"}},{"name":"case-encounter-table","slot":"patient-chart-case-encounter-slot","component":"caseEncounterTable","order":0,"online":true,"offline":false},{"component":"peerCalendarDashboardLink","name":"peer-calendar-dashboard-link","meta":{"name":"peer-calendar","title":"Peer Calendar","slot":"peer-calendar-dashboard-slot","path":"peer-management"}},{"name":"peer-calendar","slot":"peer-calendar-dashboard-slot","component":"peerCalendar","order":0,"online":true,"offline":false},{"name":"deceased-panel-dashboard-link","component":"deceasedPanelDashboardLink","slot":"patient-chart-dashboard-slot","order":15,"meta":{"columns":1,"columnSpan":1,"slot":"patient-chart-deceased-panel-slot","path":"deceased-panel","layoutMode":"anchored"}},{"name":"deceased-details-tabs","slot":"patient-chart-deceased-panel-slot","component":"deceasedDetailsTabs","order":0,"online":true,"offline":false},{"name":"parto-graph-chart","slot":"patient-chart-labour-and-delivery-dashboard-slot","component":"partograph","meta":{"fullWidth":true}}],"modals":[{"name":"birth-date-calculator","component":"birthDateCalculator"},{"name":"relationship-delete-confirm-dialog","component":"relationshipDeleteConfirmialog"},{"name":"end-relationship-dialog","component":"endRelationshipModal"}],"workspaces":[{"name":"case-management-form","component":"caseManagementForm","title":"Case Management Form","type":"form"},{"name":"family-relationship-form","component":"familyRelationshipForm","title":"Family Relationship Form","type":"form"},{"name":"peers-form","component":"peersForm","title":"Add New Peer","type":"form"},{"name":"kenyaemr-cusom-form-entry-workspace","component":"peerCalendarFormEntry","title":"KVP Peer Educator Outreach Calendar","type":"form","width":"extra-wide","canMaximize":true,"canHide":true},{"name":"contact-list-update-form","component":"contactListUpdateForm","title":"Contact List Update Form","type":"form"},{"name":"other-relationship-form","component":"otherRelationshipsForm","title":"Other Relationships Form","type":"form"},{"name":"end-relationship-form","component":"endRelationshipWorkspace","title":"Discontinue relationship form","type":"form"}],"version":"5.4.2-pre.2223"}
+{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"kenyaemr":"^19.0.0"},"pages":[],"extensions":[{"name":"clinical-view-section","component":"clinicalViewPatientDashboard","slot":"patient-chart-dashboard-slot"},{"name":"family-history","slot":"patient-chart-family-history-slot","component":"familyHistory","order":0,"online":true,"offline":false},{"name":"relationships-link","component":"relationshipsLink","slot":"patient-chart-dashboard-slot","order":14,"meta":{"columns":1,"columnSpan":1,"slot":"patient-chart-relationships-slot","path":"relationships","layoutMode":"anchored"}},{"name":"relationships","slot":"patient-chart-relationships-slot","component":"relationships","order":0,"online":true,"offline":false},{"name":"contact-list-form","component":"contactListForm"},{"name":"maternal-and-child-health-dashboard-group-link","slot":"clinical-view-section","component":"maternalAndChildHealthSideNavGroup"},{"name":"antenatal-care-dashboard-link","component":"antenatalCareLink","slot":"maternal-and-child-health-slot","meta":{"columns":1,"columnSpan":1,"slot":"patient-chart-antenatal-care-dashboard-slot","path":"antenatal-care-dashboard","layoutMode":"anchored"}},{"name":"antenatal-care-dashboard","slot":"patient-chart-antenatal-care-dashboard-slot","component":"antenatalCare"},{"name":"postnatal-care-dashboard-link","component":"postnatalCareLink","slot":"maternal-and-child-health-slot","meta":{"columns":1,"columnSpan":1,"slot":"patient-chart-postnatal-care-dashboard-slot","path":"postnatal-care-dashboard","layoutMode":"anchored"}},{"name":"postnatal-care-dashboard","slot":"patient-chart-postnatal-care-dashboard-slot","component":"postnatalCare"},{"name":"labour-and-delivery-dashboard-link","component":"labourAndDeliveryLink","slot":"maternal-and-child-health-slot","meta":{"fullWidth":true,"slot":"patient-chart-labour-and-delivery-dashboard-slot","path":"labour-and-delivery-dashboard","layoutMode":"anchored"}},{"name":"labour-and-delivery-dashboard","slot":"patient-chart-labour-and-delivery-dashboard-slot","component":"labourAndDelivery","meta":{"fullWidth":true}},{"name":"hiv-care-and-treatment-dashboard-group-link","slot":"special-clinics-slot","component":"hivCareAndTreatMentSideNavGroup"},{"name":"genericNavLinks","slot":"special-clinics-slot","component":"genericNavLinks","meta":{"columns":1,"columnSpan":1,"slot":"patient-chart-special-clinic-dashboard-slot","path":"special-clinics-dashboard","layoutMode":"anchored"}},{"name":"patient-chart-special-clinic-dashboard-slot","slot":"patient-chart-special-clinic-dashboard-slot","component":"genericDashboard"},{"name":"hts-dashboard-link","component":"htsDashboardLink","slot":"hiv-care-and-treatment-slot","meta":{"columns":1,"columnSpan":1,"slot":"patient-chart-hts-dashboard-slot","path":"hts-dashboard","layoutMode":"anchored"}},{"name":"hts-clinical-view","slot":"patient-chart-hts-dashboard-slot","component":"htsClinicalView","order":2,"online":true,"offline":false},{"name":"defaulter-tracing-dashboard-link","component":"defaulterTracingLink","slot":"hiv-care-and-treatment-slot","meta":{"columns":1,"columnSpan":1,"slot":"patient-chart-defaulter-tracing-dashboard-slot","path":"defaulter-tracing-dashboard","layoutMode":"anchored"}},{"name":"defaulter-tracing-dashboard","slot":"patient-chart-defaulter-tracing-dashboard-slot","component":"defaulterTracing","order":3,"online":true,"offline":false},{"name":"special-clinics-dashboard-group-link","slot":"clinical-view-section","component":"specialClinicsSideNavGroup"},{"name":"clinical-encounter-link","component":"inPatientClinicalEncounterLink","slot":"clinical-view-section","order":40,"meta":{"columns":1,"columnSpan":1,"slot":"patient-chart-clinical-encounter-slot","path":"clinical-encounter","layoutMode":"anchored"}},{"name":"clinical-encounter","slot":"patient-chart-clinical-encounter-slot","component":"inPatientClinicalEncounter","order":0,"online":true,"offline":false},{"component":"caseManagementDashboardLink","name":"case-management-dashboard-link","meta":{"name":"case-management","title":"Case Management","slot":"case-management-dashboard-slot","path":"/case-management"}},{"name":"in-patient-dashboard-link","component":"inPatientChartLink","slot":"patient-chart-dashboard-slot","order":7,"meta":{"slot":"patient-chart-in-patient-dashboard-slot","path":"in-patient","layoutMode":"anchored","columns":1,"columnSpan":1}},{"name":"in-patient-dashboard","slot":"patient-chart-in-patient-dashboard-slot","component":"inPatientChartDashboard","meta":{"fullWidth":false}},{"name":"wrap-component-view","slot":"case-management-dashboard-slot","component":"wrapComponent","order":2,"online":true,"offline":false},{"name":"case-encounter-link","component":"caseEncounterDashboardLink","slot":"patient-chart-dashboard-slot","order":14,"meta":{"columns":1,"columnSpan":1,"slot":"patient-chart-case-encounter-slot","path":"case-management-encounters","layoutMode":"anchored"}},{"name":"case-encounter-table","slot":"patient-chart-case-encounter-slot","component":"caseEncounterTable","order":0,"online":true,"offline":false},{"component":"peerCalendarDashboardLink","name":"peer-calendar-dashboard-link","meta":{"name":"peer-calendar","title":"Peer Calendar","slot":"peer-calendar-dashboard-slot","path":"peer-management"}},{"name":"peer-calendar","slot":"peer-calendar-dashboard-slot","component":"peerCalendar","order":0,"online":true,"offline":false},{"name":"deceased-panel-dashboard-link","component":"deceasedPanelDashboardLink","slot":"patient-chart-dashboard-slot","order":15,"meta":{"columns":1,"columnSpan":1,"slot":"patient-chart-deceased-panel-slot","path":"deceased-panel","layoutMode":"anchored"}},{"name":"deceased-details-tabs","slot":"patient-chart-deceased-panel-slot","component":"deceasedDetailsTabs","order":0,"online":true,"offline":false},{"name":"parto-graph-chart","slot":"patient-chart-labour-and-delivery-dashboard-slot","component":"partograph","meta":{"fullWidth":true}}],"modals":[{"name":"birth-date-calculator","component":"birthDateCalculator"},{"name":"relationship-delete-confirm-dialog","component":"relationshipDeleteConfirmialog"},{"name":"end-relationship-dialog","component":"endRelationshipModal"}],"workspaces":[{"name":"case-management-form","component":"caseManagementForm","title":"Case Management Form","type":"form"},{"name":"family-relationship-form","component":"familyRelationshipForm","title":"Family Relationship Form","type":"form"},{"name":"peers-form","component":"peersForm","title":"Add New Peer","type":"form"},{"name":"kenyaemr-cusom-form-entry-workspace","component":"peerCalendarFormEntry","title":"KVP Peer Educator Outreach Calendar","type":"form","width":"extra-wide","canMaximize":true,"canHide":true},{"name":"contact-list-update-form","component":"contactListUpdateForm","title":"Contact List Update Form","type":"form"},{"name":"other-relationship-form","component":"otherRelationshipsForm","title":"Other Relationships Form","type":"form"},{"name":"end-relationship-form","component":"endRelationshipWorkspace","title":"Discontinue relationship form","type":"form"}],"version":"5.4.2-pre.2234"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kenyaemr/esm-patient-clinical-view-app",
-  "version": "5.4.2-pre.2223",
+  "version": "5.4.2-pre.2234",
   "description": "Patient clinical view microfrontend for the OpenMRS SPA",
   "browser": "dist/kenyaemr-esm-patient-clinical-view-app.js",
   "main": "src/index.ts",

package/src/contact-list/contact-list.resource.tsx

@@ -167,48 +167,73 @@ export const updatePersonAttributes = (payload: any, personUuid: string, attribu
   });
 };
 
+const ATTRIBUTE_MAPPINGS = [
+  { key: 'baselineStatus', configPath: 'baselineHIVStatus', cleanValue: true },
+  { key: 'preferedPNSAproach', configPath: 'preferedPnsAproach', cleanValue: true },
+  { key: 'livingWithClient', configPath: 'livingWithContact', cleanValue: true },
+  { key: 'ipvOutCome', configPath: 'contactIPVOutcome', cleanValue: false },
+];
+
+const createAttribute = (
+  attributeType: string,
+  value: string,
+  existingAttributes: Person['attributes'],
+  cleanValue: boolean = true,
+) => ({
+  attributeType,
+  value: cleanValue ? replaceAll(value, 'A', '') : value,
+  attribute: existingAttributes.find((a) => a.attributeType.uuid === attributeType)?.uuid,
+});
+
+const buildAttributes = (
+  attributes: ContactAttributeData,
+  config: ConfigObject,
+  existingAttributes: Person['attributes'] = [],
+) => {
+  if (!attributes) {
+    return [];
+  }
+
+  return ATTRIBUTE_MAPPINGS.filter((m) => attributes[m.key]).map((m) =>
+    createAttribute(
+      config.contactPersonAttributesUuid[m.configPath],
+      attributes[m.key],
+      existingAttributes,
+      m.cleanValue,
+    ),
+  );
+};
+
 export const updateContactAttributes = async (
   personUuid: string,
-  attributeData: ContactAttributeData,
+  attributes: ContactAttributeData,
   config: ConfigObject,
   existingAttributes: Person['attributes'] = [],
 ) => {
   try {
-    const updatableAttributes = [
-      {
-        attributeType: config?.contactPersonAttributesUuid?.baselineHIVStatus,
-        value: replaceAll(attributeData?.baselineStatus, 'A', ''),
-      },
-      {
-        attributeType: config?.contactPersonAttributesUuid?.preferedPnsAproach,
-        value: replaceAll(attributeData?.preferedPNSAproach, 'A', ''),
-      },
-      {
-        attributeType: config?.contactPersonAttributesUuid?.livingWithContact,
-        value: replaceAll(attributeData?.livingWithClient, 'A', ''),
-      },
-      {
-        attributeType: config?.contactPersonAttributesUuid?.contactIPVOutcome,
-        value: attributeData?.ipvOutCome,
-      },
-    ].filter((attr) => attr?.value !== undefined && attr?.value !== null && attr?.value !== '');
-
-    await Promise.allSettled(
-      updatableAttributes?.map((attr) => {
-        const existingAttribute = existingAttributes?.find((at) => at?.attributeType?.uuid === attr?.attributeType);
-
-        const payload = {
-          attributeType: attr?.attributeType,
-          value: attr?.value,
-        };
-
-        if (!existingAttribute?.uuid) {
-          return createPersonAttribute(payload, personUuid);
-        }
-        return updatePersonAttributes(payload, personUuid, existingAttribute.uuid);
-      }),
+    const attrs = buildAttributes(attributes, config, existingAttributes);
+
+    const results = await Promise.allSettled(
+      attrs.map((attr) =>
+        openmrsFetch(`${restBaseUrl}/person/${personUuid}/attribute/${attr.attribute ?? ''}`, {
+          method: 'POST',
+          headers: {
+            'Content-Type': 'application/json',
+          },
+          body: JSON.stringify(omit(attr, ['attribute'])),
+        }),
+      ),
     );
 
+    if (results.length && results.every((r) => r.status === 'fulfilled')) {
+      showSnackbar({ title: 'Success ', kind: 'success', subtitle: 'Patient attributes updated succesfully' });
+    }
+    results.forEach((res) => {
+      if (res.status === 'rejected') {
+        showSnackbar({ title: 'Error updating patient attribute', kind: 'error', subtitle: res.reason?.message });
+      }
+    });
+
     mutate((key) => typeof key === 'string' && key.startsWith(`${restBaseUrl}/person`));
   } catch (error) {
     showSnackbar({

package/src/contact-list/forms/contact-list-update.workspace.tsx

@@ -9,39 +9,30 @@ import {
   InlineLoading,
   Stack,
   Tile,
-  RadioButtonGroup,
-  RadioButton,
 } from '@carbon/react';
 import { zodResolver } from '@hookform/resolvers/zod';
 import { DefaultWorkspaceProps, parseDate, restBaseUrl, showSnackbar, useConfig } from '@openmrs/esm-framework';
-import React, { useEffect, useMemo } from 'react';
+import dayjs from 'dayjs';
+import React, { useEffect, useMemo, useRef } from 'react';
 import { Controller, FormProvider, useForm } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
 import { mutate } from 'swr';
 import { z } from 'zod';
+import PatientInfo from '../../case-management/workspace/patient-info.component';
+import { ConfigObject } from '../../config-schema';
+import { updateContactAttributes } from '../../contact-list/contact-list.resource';
+import usePersonAttributes from '../../hooks/usePersonAttributes';
 import useRelationship from '../../hooks/useRelationship';
 import useRelationshipTypes from '../../hooks/useRelationshipTypes';
-import styles from './contact-list-update.scss';
-import PatientInfo from '../../case-management/workspace/patient-info.component';
-import usePerson, { contactIPVOutcomeOptions, updateContactAttributes } from '../../contact-list/contact-list.resource';
+import RelationshipBaselineInfoFormSection from '../../relationships/forms/baseline-info-form-section.component';
 import {
-  BOOLEAN_NO,
-  BOOLEAN_YES,
   relationshipFormSchema,
   relationshipUpdateFormSchema,
   updateRelationship,
   usePatientBirthdate,
 } from '../../relationships/relationship.resources';
 import { type Contact } from '../../types';
-import { ConfigObject } from '../../config-schema';
-import { contactListConceptMap } from '../../contact-list/contact-list-concept-map';
-import {
-  LIVING_WITH_PATIENT_CONCEPT_UUID,
-  PARTNER_HIV_STATUS_CONCEPT_UUID,
-  PNS_APROACH_CONCEPT_UUID,
-} from '../../relationships/relationships-constants';
-import dayjs from 'dayjs';
-import RelationshipBaselineInfoFormSection from '../../relationships/forms/baseline-info-form-section.component';
+import styles from './contact-list-update.scss';
 
 interface ContactListUpdateFormProps extends DefaultWorkspaceProps {
   relation: Contact;
@@ -54,35 +45,19 @@ type ContactListUpdateFormType = z.infer<typeof relationshipFormSchema>;
 const ContactListUpdateForm: React.FC<ContactListUpdateFormProps> = ({ closeWorkspace, relation, patientUuid }) => {
   const { error, isLoading, relationship } = useRelationship(relation?.uuid);
   const { isLoading: typesLoading, error: typesError, relationshipTypes } = useRelationshipTypes();
-  const { person } = usePerson(relationship?.personB?.uuid);
+  const personUuid = relationship?.personB?.uuid;
+  const { attributes } = usePersonAttributes(personUuid);
   const config = useConfig<ConfigObject>();
-
   const { t } = useTranslation();
-
-  const pnsAproach = useMemo(
-    () =>
-      Object.entries(contactListConceptMap[PNS_APROACH_CONCEPT_UUID].answers).map(([uuid, display]) => ({
-        label: display,
-        value: uuid,
-      })),
-    [],
-  );
-
-  const contactLivingWithPatient = useMemo(
-    () =>
-      Object.entries(contactListConceptMap[LIVING_WITH_PATIENT_CONCEPT_UUID].answers).map(([uuid, display]) => ({
-        label: display,
-        value: uuid,
-      })),
-    [],
-  );
-
-  const form = useForm<ContactListUpdateFormType>({
-    defaultValues: {},
+  const form = useForm<z.infer<typeof relationshipUpdateFormSchema>>({
     resolver: zodResolver(relationshipUpdateFormSchema),
+    mode: 'all',
   });
+  const { setValue } = form;
+  const { isLoading: isPatientLoading, birthdate } = usePatientBirthdate(relationship?.personB?.uuid);
 
-  const { isLoading: isPatientloading, birthdate } = usePatientBirthdate(relationship?.personB?.uuid);
+  // Use ref to track if initial values have been set
+  const initialValuesSet = useRef(false);
 
   const patientAgeMonths = useMemo(() => {
     let birthDate = birthdate ? parseDate(birthdate) : null;
@@ -93,81 +68,54 @@ const ContactListUpdateForm: React.FC<ContactListUpdateFormProps> = ({ closeWork
   }, [birthdate]);
 
   useEffect(() => {
-    if (relationship && relationshipTypes.length > 0) {
-      if (relationship.endDate) {
-        form.setValue('endDate', new Date(relationship.endDate));
-      }
+    // Only set initial values once when data is available and not already set
+    if (relationshipTypes.length > 0 && !initialValuesSet.current && relationship) {
       if (relationship.startDate) {
-        form.setValue('startDate', new Date(relationship.startDate));
-      }
-      if (relationship.relationshipType) {
-        form.setValue('relationshipType', relationship.relationshipType.uuid);
-      }
-    }
-  }, [relationship, relationshipTypes, form]);
-
-  useEffect(() => {
-    if (relation) {
-      if (relation.startDate) {
         try {
-          const startDate = new Date(relation.startDate);
-          form.setValue('startDate', startDate);
+          const startDate = parseDate(relationship.startDate);
+          setValue('startDate', startDate);
         } catch (e) {
-          console.warn('Invalid start date format:', relation.startDate);
+          console.warn('Invalid start date format:', relationship.startDate);
         }
       }
 
-      if (relation.endDate) {
+      if (relationship.endDate) {
         try {
-          const endDate = new Date(relation.endDate);
-          form.setValue('endDate', endDate);
+          const endDate = parseDate(relationship.endDate);
+          setValue('endDate', endDate);
         } catch (e) {
-          console.warn('Invalid end date format:', relation.endDate);
+          console.warn('Invalid end date format:', relationship.endDate);
         }
       }
 
-      if (relation.relationshipType && relationshipTypes.length > 0) {
-        const relType = relationshipTypes.find(
-          (type) =>
-            type.displayBIsToA === relation.relationshipType || type.displayAIsToB === relation.relationshipType,
-        );
-        if (relType) {
-          form.setValue('relationshipType', relType.uuid);
-        }
+      if (relationship.relationshipType?.uuid) {
+        setValue('relationshipType', relationship.relationshipType.uuid);
       }
+
+      // Mark that initial values have been set
+      initialValuesSet.current = true;
     }
-  }, [relation, relationshipTypes, form]);
+  }, [relationshipTypes, setValue, relationship]);
 
   const onSubmit = async (values: ContactListUpdateFormType) => {
     try {
-      const data = form.getValues();
-
       await updateRelationship(relationship.uuid, values);
-
       await updateContactAttributes(
-        person?.uuid,
+        personUuid,
         {
-          baselineStatus: data?.baselineStatus,
-          preferedPNSAproach: data?.preferedPNSAproach,
-          livingWithClient: data?.livingWithClient,
-          ipvOutCome: data?.ipvOutCome,
+          baselineStatus: values?.baselineStatus,
+          preferedPNSAproach: values?.preferedPNSAproach,
+          livingWithClient: values?.livingWithClient,
+          ipvOutCome: values?.ipvOutCome,
         },
         config,
-        person?.attributes?.map((attr) => ({
-          uuid: attr.uuid,
-          display: attr.display ?? '',
-          value: attr.value,
-          attributeType: {
-            uuid: attr.attributeType.uuid,
-            display: attr.attributeType.display ?? '',
-          },
-        })),
+        attributes,
       );
 
       showSnackbar({
         title: 'Success',
         kind: 'success',
-        subtitle: t('relationshipUpdated', ' Relationship updated successfully'),
+        subtitle: t('relationshipUpdated', 'Relationship updated successfully'),
       });
 
       mutate((key) => {
@@ -178,13 +126,13 @@ const ContactListUpdateForm: React.FC<ContactListUpdateFormProps> = ({ closeWork
     } catch (error) {
       showSnackbar({
         title: 'Error',
-        subtitle: 'Failure updating relationship! ' + JSON.stringify(error),
+        subtitle: 'Failure updating relationship! ' + (error?.message || JSON.stringify(error)),
         kind: 'error',
       });
     }
   };
 
-  if (isLoading || typesLoading) {
+  if (isLoading || typesLoading || isPatientLoading) {
     return (
       <div className={styles.loading}>
         <InlineLoading status="active" iconDescription="Loading" description="Loading form..." />
@@ -203,6 +151,17 @@ const ContactListUpdateForm: React.FC<ContactListUpdateFormProps> = ({ closeWork
     );
   }
 
+  if (!relationship) {
+    return (
+      <div className={styles.error}>
+        <Tile id="no-relationship">
+          <strong>Error:</strong>
+          <p>{t('noRelationshipFound', 'No relationship data found')}</p>
+        </Tile>
+      </div>
+    );
+  }
+
   return (
     <FormProvider {...form}>
       <Form onSubmit={form.handleSubmit(onSubmit)}>
@@ -210,7 +169,6 @@ const ContactListUpdateForm: React.FC<ContactListUpdateFormProps> = ({ closeWork
           <Column>
             <PatientInfo patientUuid={relationship?.personB?.uuid || relation?.relativeUuid} />
           </Column>
-
           <span className={styles.sectionHeader}>{t('relationship', 'Relationship')}</span>
           <Column>
             <Controller
@@ -221,7 +179,8 @@ const ContactListUpdateForm: React.FC<ContactListUpdateFormProps> = ({ closeWork
                   className={styles.datePickerInput}
                   dateFormat="d/m/Y"
                   datePickerType="single"
-                  {...field}
+                  value={field.value}
+                  onChange={(v) => field.onChange(v[0])}
                   ref={undefined}
                   invalid={!!error?.message}
                   invalidText={error?.message}>
@@ -247,15 +206,15 @@ const ContactListUpdateForm: React.FC<ContactListUpdateFormProps> = ({ closeWork
                   className={styles.datePickerInput}
                   dateFormat="d/m/Y"
                   datePickerType="single"
-                  {...field}
-                  ref={undefined}
+                  value={field.value}
+                  onChange={(dates) => field.onChange(dates[0])}
                   invalid={!!error?.message}
                   invalidText={error?.message}>
                   <DatePickerInput
                     id="enddate-input"
                     invalid={!!error?.message}
                     invalidText={error?.message}
-                    placeholder="mm/dd/yyyy"
+                    placeholder="dd/mm/yyyy"
                     labelText={t('endDate', 'End Date')}
                     size="lg"
                   />
@@ -287,10 +246,7 @@ const ContactListUpdateForm: React.FC<ContactListUpdateFormProps> = ({ closeWork
             />
           </Column>
 
-          <RelationshipBaselineInfoFormSection
-            patientAgeMonths={patientAgeMonths}
-            patientUuid={relationship?.personB?.uuid}
-          />
+          <RelationshipBaselineInfoFormSection patientAgeMonths={patientAgeMonths} patientUuid={personUuid} />
         </Stack>
 
         <ButtonSet className={styles.buttonSet}>
@@ -298,7 +254,7 @@ const ContactListUpdateForm: React.FC<ContactListUpdateFormProps> = ({ closeWork
             {t('discard', 'Discard')}
           </Button>
           <Button className={styles.button} kind="primary" type="submit" disabled={form.formState.isSubmitting}>
-            {t('submit', 'Submit')}
+            {form.formState.isSubmitting ? t('submitting', 'Submitting...') : t('submit', 'Submit')}
           </Button>
         </ButtonSet>
       </Form>

package/src/hooks/useRelationshipTypes.ts

@@ -1,16 +1,19 @@
-import { openmrsFetch } from '@openmrs/esm-framework';
+import { openmrsFetch, useConfig } from '@openmrs/esm-framework';
 import useSWR from 'swr';
 import { RelationShipType } from '../types';
+import { ConfigObject } from '../config-schema';
 
 const useRelationshipTypes = () => {
   const customeRepresentation = 'custom:(uuid,displayAIsToB,displayBIsToA)';
   const url = `/ws/rest/v1/relationshiptype?v=${customeRepresentation}`;
-
+  const { relationshipTypesList } = useConfig<ConfigObject>();
   const { data, error, isLoading } = useSWR<{ data: { results: RelationShipType[] } }>(url, openmrsFetch);
   return {
     error,
     isLoading,
-    relationshipTypes: data?.data?.results ?? [],
+    relationshipTypes: (data?.data?.results ?? []).filter(
+      (r) => relationshipTypesList.findIndex((rl) => rl.uuid === r.uuid) !== -1,
+    ),
   };
 };
 

package/src/relationships/forms/baseline-info-form-section.component.tsx

@@ -45,6 +45,7 @@ const RelationshipBaselineInfoFormSection: FC<RelationshipBaselineInfoFormSectio
   const config = useConfig<ConfigObject>();
   const { setValue } = form;
   const { attributes, isLoading } = usePersonAttributes(patientUuid);
+
   const pnsAproach = useMemo(
     () =>
       Object.entries(contactListConceptMap[PNS_APROACH_CONCEPT_UUID].answers).map(([uuid, display]) => ({
@@ -92,6 +93,7 @@ const RelationshipBaselineInfoFormSection: FC<RelationshipBaselineInfoFormSectio
     [patientAgeMonths],
   );
 
+  // useEffect for IPV outcome logic
   useEffect(() => {
     if ([observablePhysicalAssault, observableThreatened, observableSexualAssault].includes(BOOLEAN_YES)) {
       form.setValue('ipvOutCome', 'True');
@@ -103,68 +105,79 @@ const RelationshipBaselineInfoFormSection: FC<RelationshipBaselineInfoFormSectio
     if (!showIPVRelatedFields) {
       form.setValue('ipvOutCome', undefined);
     }
-  }, [
-    observablePhysicalAssault,
-    observableThreatened,
-    observableSexualAssault,
-    observableRelationship,
-    form,
-    showIPVRelatedFields,
-  ]);
+  }, [observablePhysicalAssault, observableThreatened, observableSexualAssault, form, showIPVRelatedFields]);
 
+  // Set initial values from attributes only once
   useEffect(() => {
-    if (attributes.length) {
-      const hivStatusAttribute = attributes.find(
-        (a) => a.attributeType.uuid === config.contactPersonAttributesUuid.baselineHIVStatus,
-      );
-      if (hivStatusAttribute) {
-        const value = hivStatus.find((r) => r.value.startsWith(hivStatusAttribute.value))?.value;
-        if (value) {
-          setValue('baselineStatus', value);
+    // Only set values once when attributes are loaded and not already set
+    if (attributes.length > 0 || hivStatusPersonB) {
+      if (attributes.length > 0) {
+        const hivStatusAttribute = attributes.find(
+          (a) => a.attributeType.uuid === config.contactPersonAttributesUuid.baselineHIVStatus,
+        );
+        if (hivStatusAttribute) {
+          const value = hivStatus.find((r) => r.value.startsWith(hivStatusAttribute.value))?.value;
+          if (value) {
+            setValue('baselineStatus', value);
+          }
         }
-      } else if (hivStatusPersonB) {
-        const value = hivStatus.find((r) => r.label.toLowerCase().includes(hivStatusPersonB.toLowerCase()))?.value;
-        if (value) {
-          setValue('baselineStatus', value);
+
+        const pnsAproachAttribute = attributes.find(
+          (a) => a.attributeType.uuid === config.contactPersonAttributesUuid.preferedPnsAproach,
+        );
+        if (pnsAproachAttribute) {
+          const value = pnsAproach.find((r) => r.value.startsWith(pnsAproachAttribute.value))?.value;
+          if (value) {
+            setValue('preferedPNSAproach', value);
+          }
         }
-      }
 
-      const pnsAproachAttribute = attributes.find(
-        (a) => a.attributeType.uuid === config.contactPersonAttributesUuid.preferedPnsAproach,
-      );
-      if (pnsAproachAttribute) {
-        const value = pnsAproach.find((r) => r.value.startsWith(pnsAproachAttribute.value))?.value;
-        if (value) {
-          setValue('preferedPNSAproach', value);
+        const livingWithPatientAttribute = attributes.find(
+          (a) => a.attributeType.uuid === config.contactPersonAttributesUuid.livingWithContact,
+        );
+        if (livingWithPatientAttribute) {
+          const value = contactLivingWithPatient.find((r) =>
+            r.value.startsWith(livingWithPatientAttribute.value),
+          )?.value;
+          if (value) {
+            setValue('livingWithClient', value);
+          }
         }
-      }
 
-      const livingWithPatientAttribute = attributes.find(
-        (a) => a.attributeType.uuid === config.contactPersonAttributesUuid.livingWithContact,
-      );
-      if (livingWithPatientAttribute) {
-        const value = contactLivingWithPatient.find((r) => r.value.startsWith(livingWithPatientAttribute.value))?.value;
-        if (value) {
-          setValue('livingWithClient', value);
+        const ipvAttr = attributes.find(
+          (a) => a.attributeType.uuid === config.contactPersonAttributesUuid.contactIPVOutcome,
+        );
+        if (ipvAttr) {
+          const value = contactIPVOutcomeOptions.find((r) => r.value.startsWith(ipvAttr.value))?.value;
+          if (value) {
+            setValue('ipvOutCome', value as any);
+          }
         }
       }
 
-      const ipvAttr = attributes.find(
-        (a) => a.attributeType.uuid === config.contactPersonAttributesUuid.contactIPVOutcome,
-      );
-      if (ipvAttr) {
-        const value = contactIPVOutcomeOptions.find((r) => r.value.startsWith(ipvAttr.value))?.value;
+      // Handle hivStatusPersonB when no attributes but HIV status is available
+      if (
+        hivStatusPersonB &&
+        !attributes.find((a) => a.attributeType.uuid === config.contactPersonAttributesUuid.baselineHIVStatus)
+      ) {
+        const value = hivStatus.find((r) => r.label.toLowerCase().includes(hivStatusPersonB.toLowerCase()))?.value;
         if (value) {
-          setValue('ipvOutCome', value as any);
+          setValue('baselineStatus', value);
         }
       }
-    } else if (hivStatusPersonB) {
-      const value = hivStatus.find((r) => r.label.toLowerCase().includes(hivStatusPersonB.toLowerCase()))?.value;
-      if (value) {
-        setValue('baselineStatus', value);
-      }
     }
-  }, [attributes, setValue, config, hivStatus, pnsAproach, contactLivingWithPatient, hivStatusPersonB]);
+  }, [
+    attributes,
+    contactLivingWithPatient,
+    hivStatus,
+    hivStatusPersonB,
+    pnsAproach,
+    setValue,
+    config.contactPersonAttributesUuid.baselineHIVStatus,
+    config.contactPersonAttributesUuid.preferedPnsAproach,
+    config.contactPersonAttributesUuid.livingWithContact,
+    config.contactPersonAttributesUuid.contactIPVOutcome,
+  ]);
 
   return (
     <>