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

package/src/contact-list/contact-tracing-history.component.tsx

@@ -94,7 +94,7 @@ const ContactTracingHistory: React.FC<ContactTracingHistoryProps> = ({ patientUu
           />
         ),
       })),
-    [results],
+    [results, t],
   );
 
   if (contactTracesHistory.length === 0) {
@@ -121,9 +121,9 @@ const ContactTracingHistory: React.FC<ContactTracingHistoryProps> = ({ patientUu
                     <TableHeader
                       {...getHeaderProps({
                         header,
-                        isSortable: header.isSortable,
+                        isSortable: true,
                       })}>
-                      {header.header?.content ?? header.header}
+                      {header.header}
                     </TableHeader>
                   ))}
                 </TableRow>

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

@@ -13,7 +13,7 @@ import {
   RadioButton,
 } from '@carbon/react';
 import { zodResolver } from '@hookform/resolvers/zod';
-import { DefaultWorkspaceProps, restBaseUrl, showSnackbar, useConfig } from '@openmrs/esm-framework';
+import { DefaultWorkspaceProps, parseDate, restBaseUrl, showSnackbar, useConfig } from '@openmrs/esm-framework';
 import React, { useEffect, useMemo } from 'react';
 import { Controller, FormProvider, useForm } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
@@ -30,6 +30,7 @@ import {
   relationshipFormSchema,
   relationshipUpdateFormSchema,
   updateRelationship,
+  usePatientBirthdate,
 } from '../../relationships/relationship.resources';
 import { type Contact } from '../../types';
 import { ConfigObject } from '../../config-schema';
@@ -39,6 +40,8 @@ import {
   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';
 
 interface ContactListUpdateFormProps extends DefaultWorkspaceProps {
   relation: Contact;
@@ -56,15 +59,6 @@ const ContactListUpdateForm: React.FC<ContactListUpdateFormProps> = ({ closeWork
 
   const { t } = useTranslation();
 
-  const hivStatus = useMemo(
-    () =>
-      Object.entries(contactListConceptMap[PARTNER_HIV_STATUS_CONCEPT_UUID].answers).map(([uuid, display]) => ({
-        label: display,
-        value: uuid,
-      })),
-    [],
-  );
-
   const pnsAproach = useMemo(
     () =>
       Object.entries(contactListConceptMap[PNS_APROACH_CONCEPT_UUID].answers).map(([uuid, display]) => ({
@@ -84,32 +78,19 @@ const ContactListUpdateForm: React.FC<ContactListUpdateFormProps> = ({ closeWork
   );
 
   const form = useForm<ContactListUpdateFormType>({
-    defaultValues: {
-      endDate: undefined,
-      startDate: undefined,
-      relationshipType: undefined,
-      baselineStatus: undefined,
-      preferedPNSAproach: undefined,
-      livingWithClient: undefined,
-      ipvOutCome: undefined,
-      physicalAssault: undefined,
-      threatened: undefined,
-      sexualAssault: undefined,
-    },
+    defaultValues: {},
     resolver: zodResolver(relationshipUpdateFormSchema),
   });
 
-  const observableRelationship = form.watch('relationshipType');
-  const showIPVRelatedFields = useMemo(() => {
-    if (!observableRelationship || !config.relationshipTypesList) {
-      return false;
+  const { isLoading: isPatientloading, birthdate } = usePatientBirthdate(relationship?.personB?.uuid);
+
+  const patientAgeMonths = useMemo(() => {
+    let birthDate = birthdate ? parseDate(birthdate) : null;
+    if (birthDate) {
+      return dayjs().diff(birthDate, 'month');
     }
-    return (
-      config.relationshipTypesList.findIndex(
-        (r) => r.uuid === observableRelationship && r.category.some((c) => c === 'sexual'),
-      ) !== -1
-    );
-  }, [observableRelationship, config.relationshipTypesList]);
+    return null;
+  }, [birthdate]);
 
   useEffect(() => {
     if (relationship && relationshipTypes.length > 0) {
@@ -126,55 +107,7 @@ const ContactListUpdateForm: React.FC<ContactListUpdateFormProps> = ({ closeWork
   }, [relationship, relationshipTypes, form]);
 
   useEffect(() => {
-    if (relation && hivStatus.length > 0 && pnsAproach.length > 0 && contactLivingWithPatient.length > 0) {
-      if (relation.baselineHIVStatus) {
-        const hivStatusValue = hivStatus.find(
-          (status) =>
-            typeof status.label === 'string' &&
-            status.label.toLowerCase().includes(relation.baselineHIVStatus.toLowerCase()),
-        )?.value;
-        if (hivStatusValue) {
-          form.setValue('baselineStatus', hivStatusValue);
-        }
-      }
-
-      if (relation.pnsAproach) {
-        const pnsValue = pnsAproach.find((approach) =>
-          (approach.label as string).toLowerCase().includes((relation.pnsAproach as string).toLowerCase()),
-        )?.value;
-        if (pnsValue) {
-          form.setValue('preferedPNSAproach', pnsValue);
-        }
-      }
-
-      if (relation.livingWithClient) {
-        const livingValue = contactLivingWithPatient.find((living) => {
-          const relationLiving = (relation.livingWithClient as string).toLowerCase();
-          const livingLabel = (living.label as string).toLowerCase();
-
-          return (
-            livingLabel === relationLiving ||
-            livingLabel.includes(relationLiving) ||
-            relationLiving.includes(livingLabel)
-          );
-        })?.value;
-
-        if (livingValue) {
-          form.setValue('livingWithClient', livingValue);
-        }
-      }
-
-      if (relation.ipvOutcome) {
-        const ipvValue = contactIPVOutcomeOptions.find(
-          (outcome) =>
-            outcome.value === relation.ipvOutcome ||
-            outcome.label.toLowerCase().includes(relation.ipvOutcome.toLowerCase()),
-        )?.value;
-        if (ipvValue) {
-          form.setValue('ipvOutCome', ipvValue as any);
-        }
-      }
-
+    if (relation) {
       if (relation.startDate) {
         try {
           const startDate = new Date(relation.startDate);
@@ -203,24 +136,7 @@ const ContactListUpdateForm: React.FC<ContactListUpdateFormProps> = ({ closeWork
         }
       }
     }
-  }, [relation, hivStatus, pnsAproach, contactLivingWithPatient, relationshipTypes, form]);
-
-  const observablePhysicalAssault = form.watch('physicalAssault');
-  const observableThreatened = form.watch('threatened');
-  const observableSexualAssault = form.watch('sexualAssault');
-
-  useEffect(() => {
-    if ([observablePhysicalAssault, observableThreatened, observableSexualAssault].includes(BOOLEAN_YES)) {
-      form.setValue('ipvOutCome', 'True');
-    } else if (
-      [observablePhysicalAssault, observableThreatened, observableSexualAssault].every((v) => v === BOOLEAN_NO)
-    ) {
-      form.setValue('ipvOutCome', 'False');
-    }
-    if (!showIPVRelatedFields) {
-      form.setValue('ipvOutCome', undefined);
-    }
-  }, [observablePhysicalAssault, observableThreatened, observableSexualAssault, showIPVRelatedFields, form]);
+  }, [relation, relationshipTypes, form]);
 
   const onSubmit = async (values: ContactListUpdateFormType) => {
     try {
@@ -304,7 +220,6 @@ const ContactListUpdateForm: React.FC<ContactListUpdateFormProps> = ({ closeWork
                 <DatePicker
                   className={styles.datePickerInput}
                   dateFormat="d/m/Y"
-                  id="startDate"
                   datePickerType="single"
                   {...field}
                   ref={undefined}
@@ -312,12 +227,11 @@ const ContactListUpdateForm: React.FC<ContactListUpdateFormProps> = ({ closeWork
                   invalidText={error?.message}>
                   <DatePickerInput
                     id={`startdate-input`}
-                    name="startdate-input"
                     invalid={!!error?.message}
                     invalidText={error?.message}
                     placeholder="mm/dd/yyyy"
                     labelText={t('startDate', 'Start Date')}
-                    size="xl"
+                    size="lg"
                   />
                 </DatePicker>
               )}
@@ -332,7 +246,6 @@ const ContactListUpdateForm: React.FC<ContactListUpdateFormProps> = ({ closeWork
                 <DatePicker
                   className={styles.datePickerInput}
                   dateFormat="d/m/Y"
-                  id="endDate"
                   datePickerType="single"
                   {...field}
                   ref={undefined}
@@ -340,12 +253,11 @@ const ContactListUpdateForm: React.FC<ContactListUpdateFormProps> = ({ closeWork
                   invalidText={error?.message}>
                   <DatePickerInput
                     id="enddate-input"
-                    name="enddate-input"
                     invalid={!!error?.message}
                     invalidText={error?.message}
                     placeholder="mm/dd/yyyy"
                     labelText={t('endDate', 'End Date')}
-                    size="xl"
+                    size="lg"
                   />
                 </DatePicker>
               )}
@@ -369,173 +281,16 @@ const ContactListUpdateForm: React.FC<ContactListUpdateFormProps> = ({ closeWork
                   selectedItem={field.value}
                   label="Select Relationship"
                   items={relationshipTypes.map((r) => r.uuid)}
-                  itemToString={(item) => relationshipTypes.find((r) => r.uuid === item)?.displayBIsToA ?? ''}
+                  itemToString={(item) => relationshipTypes.find((r) => r.uuid === item)?.displayBIsToA.toString()}
                 />
               )}
             />
           </Column>
 
-          <Column>
-            <Controller
-              control={form.control}
-              name="livingWithClient"
-              render={({ field, fieldState: { error } }) => (
-                <Dropdown
-                  ref={field.ref}
-                  invalid={!!error?.message}
-                  invalidText={error?.message}
-                  id="livingWithClient"
-                  titleText={t('livingWithClient', 'Living with client')}
-                  onChange={(e: { selectedItem: string }) => {
-                    field.onChange(e.selectedItem);
-                  }}
-                  selectedItem={field.value}
-                  label="Select"
-                  items={contactLivingWithPatient.map((r) => r.value)}
-                  itemToString={(item: string) => contactLivingWithPatient.find((r) => r.value === item)?.label ?? ''}
-                />
-              )}
-            />
-          </Column>
-
-          {showIPVRelatedFields && (
-            <>
-              <span className={styles.sectionHeader}>{t('ipvQuestions', 'IPV Questions')}</span>
-              <Column>
-                <Controller
-                  control={form.control}
-                  name="physicalAssault"
-                  render={({ field, fieldState: { error } }) => (
-                    <RadioButtonGroup
-                      id="physicalAssault"
-                      legendText={t(
-                        'physicalAssault',
-                        '1. Has he/she ever hit, kicked, slapped, or otherwise physically hurt you?',
-                      )}
-                      {...field}
-                      invalid={!!error?.message}
-                      invalidText={error?.message}
-                      className={styles.billingItem}>
-                      <RadioButton labelText={t('yes', 'Yes')} value={BOOLEAN_YES} id="physicalAssault_yes" />
-                      <RadioButton labelText={t('no', 'No')} value={BOOLEAN_NO} id="physicalAssault_no" />
-                    </RadioButtonGroup>
-                  )}
-                />
-              </Column>
-              <Column>
-                <Controller
-                  control={form.control}
-                  name="threatened"
-                  render={({ field, fieldState: { error } }) => (
-                    <RadioButtonGroup
-                      id="threatened"
-                      legendText={t('threatened', '2. Has he/she ever threatened to hurt you?')}
-                      {...field}
-                      invalid={!!error?.message}
-                      invalidText={error?.message}
-                      className={styles.billingItem}>
-                      <RadioButton labelText={t('yes', 'Yes')} value={BOOLEAN_YES} id="threatened_yes" />
-                      <RadioButton labelText={t('no', 'No')} value={BOOLEAN_NO} id="threatened_no" />
-                    </RadioButtonGroup>
-                  )}
-                />
-              </Column>
-              <Column>
-                <Controller
-                  control={form.control}
-                  name="sexualAssault"
-                  render={({ field, fieldState: { error } }) => (
-                    <RadioButtonGroup
-                      id="sexualAssault"
-                      legendText={t(
-                        'sexualAssault',
-                        '3.Has he/she ever forced you to do something sexually that made you feel uncomfortable?',
-                      )}
-                      {...field}
-                      invalid={!!error?.message}
-                      invalidText={error?.message}
-                      className={styles.billingItem}>
-                      <RadioButton labelText={t('yes', 'Yes')} value={BOOLEAN_YES} id="sexualAssault_yes" />
-                      <RadioButton labelText={t('no', 'No')} value={BOOLEAN_NO} id="sexualAssault_no" />
-                    </RadioButtonGroup>
-                  )}
-                />
-              </Column>
-              <span className={styles.sectionHeader}>{t('ipvOutcome', 'IPV Outcome')}</span>
-              <Column>
-                <Controller
-                  control={form.control}
-                  name="ipvOutCome"
-                  render={({ field, fieldState: { error } }) => (
-                    <Dropdown
-                      ref={field.ref}
-                      invalid={!!error?.message}
-                      invalidText={error?.message}
-                      id="ipvOutCome"
-                      titleText={t('ipvOutCome', 'IPV Outcome')}
-                      onChange={(e) => {
-                        field.onChange(e.selectedItem);
-                      }}
-                      selectedItem={field.value}
-                      label="Choose option"
-                      items={contactIPVOutcomeOptions.map((r) => r.value)}
-                      itemToString={(item) => {
-                        return contactIPVOutcomeOptions.find((r) => r.value === item)?.label ?? '';
-                      }}
-                    />
-                  )}
-                />
-              </Column>
-            </>
-          )}
-
-          <span className={styles.sectionHeader}>{t('baselineInformation', 'Baseline Information')}</span>
-          <Column>
-            <Controller
-              control={form.control}
-              name="baselineStatus"
-              render={({ field, fieldState: { error } }) => (
-                <Dropdown
-                  ref={field.ref}
-                  invalid={!!error?.message}
-                  invalidText={error?.message}
-                  id="baselineStatus"
-                  titleText={t('baselineStatus', 'HIV Status')}
-                  onChange={(e: { selectedItem: string }) => {
-                    field.onChange(e.selectedItem);
-                  }}
-                  selectedItem={field.value}
-                  label="Select HIV Status"
-                  items={hivStatus.map((r) => r.value)}
-                  itemToString={(item: string) => hivStatus.find((r) => r.value === item)?.label ?? ''}
-                />
-              )}
-            />
-          </Column>
-
-          <Column>
-            <Controller
-              control={form.control}
-              name="preferedPNSAproach"
-              render={({ field, fieldState: { error } }) => (
-                <Dropdown
-                  ref={field.ref}
-                  invalid={!!error?.message}
-                  invalidText={error?.message}
-                  id="preferedPNSAproach"
-                  titleText={t('preferedPNSAproach', 'Preferred PNS Approach')}
-                  onChange={(e: { selectedItem: string }) => {
-                    field.onChange(e.selectedItem);
-                  }}
-                  selectedItem={field.value}
-                  className={styles.preferredPnsApproach}
-                  label="Select Approach"
-                  items={pnsAproach.map((r) => r.value)}
-                  itemToString={(item: string) => pnsAproach.find((r) => r.value === item)?.label ?? ''}
-                />
-              )}
-            />
-          </Column>
+          <RelationshipBaselineInfoFormSection
+            patientAgeMonths={patientAgeMonths}
+            patientUuid={relationship?.personB?.uuid}
+          />
         </Stack>
 
         <ButtonSet className={styles.buttonSet}>

package/src/deceased-panel/mortuary-summary/mortuary-summary.component.tsx

@@ -19,18 +19,10 @@ const MortuarySummary: React.FC = () => {
   const patientUuid = getPatientUuidFromStore();
   const { person, isLoading } = usePerson(patientUuid);
   const { activeVisit, isLoading: isActiveLoading } = useActiveMorgueVisit(patientUuid);
-  const startDate = activeVisit?.startDatetime;
-  const compartment = activeVisit?.encounters[0]?.location?.display;
 
   if (isLoading || isActiveLoading) {
     return (
-      <InlineLoading
-        status="active"
-        iconDescription="Loading"
-        Suggested
-        change
-        description={t('loadData', 'Loading summary data...')}
-      />
+      <InlineLoading status="active" iconDescription="Loading" description={t('loadData', 'Loading summary data...')} />
     );
   }
 
@@ -38,7 +30,7 @@ const MortuarySummary: React.FC = () => {
     <div className={styles.summaryContainer}>
       <p className={styles.morgueLabel}>{''}</p>
       <ExtensionSlot name="deceased-banner-info-slot" state={{ patientUuid }} />
-      <Tabs className={classNames(styles.verticalTabs, layout === 'tablet' ? styles.tabletTabs : styles.desktopTabs)}>
+      <Tabs>
         <TabList aria-label="morgue summary tabs" className={styles.tablist}>
           <Tab className={styles.tab} id="billing-tab">
             {t('billingHistory', 'Billing history')}

package/src/deceased-panel/mortuary-summary/mortuary-summary.scss

@@ -10,7 +10,7 @@
 }
 
 .summaryContainer {
-  background-color: $ui-background;
+  background-color: colors.$white;
   display: grid;
   grid-template-columns: max-content auto;
 

package/src/deceased-panel/panels/autopsy.component.tsx

@@ -1,12 +1,19 @@
 import React from 'react';
 import { useTranslation } from 'react-i18next';
-import { formatDate, isDesktop, parseDate, useConfig, useLayoutType, usePagination } from '@openmrs/esm-framework';
+import {
+  formatDate,
+  isDesktop,
+  launchWorkspace,
+  parseDate,
+  useConfig,
+  useLayoutType,
+  usePagination,
+} from '@openmrs/esm-framework';
 import {
   CardHeader,
   EmptyState,
   ErrorState,
   getPatientUuidFromStore,
-  launchPatientWorkspace,
   usePaginationInfo,
 } from '@openmrs/esm-patient-common-lib';
 import {
@@ -50,7 +57,7 @@ const AutopsyView: React.FC = () => {
   const { pageSizes } = usePaginationInfo(pageSize, encounters?.length, currentPage, results?.length);
 
   const handleLaunchAutopsyForm = (encounterUUID = '') => {
-    launchPatientWorkspace('patient-form-entry-workspace', {
+    launchWorkspace('patient-form-entry-workspace', {
       workspaceTitle: t('autopsyReport', 'Autopsy report'),
       mutateForm: () => mutate(),
       formInfo: {
@@ -110,7 +117,7 @@ const AutopsyView: React.FC = () => {
     formName: encounter?.form?.name,
     mortician: encounter?.encounterProviders[0]?.provider?.name,
     action: (
-      <OverflowMenu aria-label="overflow-menu" flipped="false">
+      <OverflowMenu aria-label="overflow-menu" flipped={false}>
         <OverflowMenuItem onClick={() => handleLaunchAutopsyForm(encounter.uuid)} itemText={t('edit', 'Edit')} />
       </OverflowMenu>
     ),

package/src/declarations.d.ts

@@ -1,15 +1,2 @@
 declare module '*.css';
 declare module '*.scss';
-declare module '@carbon/react';
-declare module 'react-aria' {
-  export const I18nProvider: (...args: any) => JSX.Element;
-  export { DateValue } from '@react-types/datepicker';
-  export const mergeProps: any;
-  export const useLocale: any;
-  export const useDateField: any;
-  export const useDatePicker: any;
-  export const useDateSegment: any;
-  export const useFocusRing: any;
-  export const useHover: any;
-  export const useObjectRef: any;
-}

package/src/family-partner-history/family-history.component.tsx

@@ -221,9 +221,9 @@ const FamilyHistory: React.FC<FamilyHistoryProps> = ({ patientUuid }) => {
                     <TableHeader
                       {...getHeaderProps({
                         header,
-                        isSortable: header.isSortable,
+                        isSortable: true,
                       })}>
-                      {header.header?.content ?? header.header}
+                      {header.header}
                     </TableHeader>
                   ))}
                 </TableRow>

package/src/family-partner-history/family-history.scss

@@ -1,7 +1,7 @@
 @use '@carbon/colors';
 @use '@carbon/layout';
 @use '@carbon/type';
-@import '~@openmrs/esm-styleguide/src/vars';
+@use '~@openmrs/esm-styleguide/src/vars' as *;
 
 .widgetContainer {
   background-color: colors.$white-0;

package/src/family-partner-history/family-relationship.scss

@@ -1,7 +1,7 @@
 @use '@carbon/styles/scss/spacing';
 @use '@carbon/styles/scss/type';
 @use '@carbon/layout';
-@import '~@openmrs/esm-styleguide/src/vars';
+@use '~@openmrs/esm-styleguide/src/vars' as *;
 
 .heading {
   @include type.type-style('heading-compact-01');

package/src/family-partner-history/family-relationship.workspace.tsx

@@ -1,6 +1,6 @@
 import { Button, ButtonSet, Column, ComboBox, DatePicker, DatePickerInput, Form, Stack } from '@carbon/react';
 import { zodResolver } from '@hookform/resolvers/zod';
-import { useConfig, useSession } from '@openmrs/esm-framework';
+import { parseDate, useConfig, useSession } from '@openmrs/esm-framework';
 import React, { useMemo } from 'react';
 import { Controller, FormProvider, SubmitHandler, useForm } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
@@ -10,10 +10,11 @@ import { saveContact } from '../contact-list/contact-list.resource';
 import usePersonAttributes from '../hooks/usePersonAttributes';
 import RelationshipBaselineInfoFormSection from '../relationships/forms/baseline-info-form-section.component';
 import PatientSearchCreate from '../relationships/forms/patient-search-create-form';
-import { relationshipFormSchema } from '../relationships/relationship.resources';
+import { relationshipFormSchema, usePatientBirthdate } from '../relationships/relationship.resources';
 import { uppercaseText } from '../utils/expression-helper';
 import styles from './family-relationship.scss';
 import { useMappedRelationshipTypes } from './relationships.resource';
+import dayjs from 'dayjs';
 
 const schema = relationshipFormSchema
   .refine(
@@ -62,7 +63,21 @@ const FamilyRelationshipForm: React.FC<RelationshipFormProps> = ({ closeWorkspac
   });
   const personUuid = form.watch('personB');
   const { attributes } = usePersonAttributes(personUuid);
-
+  const { isLoading: isPatientloading, birthdate } = usePatientBirthdate(personUuid);
+  const mode = form.watch('mode');
+  const dobCreateMode = form.watch('personBInfo.birthdate');
+  const patientAgeMonths = useMemo(() => {
+    let birthDate: Date | null = null;
+    if (mode === 'create') {
+      birthDate = dobCreateMode;
+    } else {
+      birthDate = birthdate ? parseDate(birthdate) : null;
+    }
+    if (birthDate) {
+      return dayjs().diff(birthDate, 'month');
+    }
+    return null;
+  }, [mode, dobCreateMode, birthdate]);
   const { control, handleSubmit } = form;
 
   const onSubmit: SubmitHandler<FormData> = async (data) => {
@@ -105,18 +120,18 @@ const FamilyRelationshipForm: React.FC<RelationshipFormProps> = ({ closeWorkspac
                 <DatePicker
                   className={styles.datePickerInput}
                   dateFormat="d/m/Y"
-                  id="startDate"
                   datePickerType="single"
                   {...field}
                   ref={undefined}
-                  invalid={error?.message}
+                  invalid={!!error?.message}
                   invalidText={error?.message}>
                   <DatePickerInput
-                    invalid={error?.message}
+                    invalid={!!error?.message}
                     invalidText={error?.message}
                     placeholder="mm/dd/yyyy"
                     labelText={t('startDate', 'Start Date')}
-                    size="xl"
+                    size="lg"
+                    id="startDate"
                   />
                 </DatePicker>
               )}
@@ -130,24 +145,24 @@ const FamilyRelationshipForm: React.FC<RelationshipFormProps> = ({ closeWorkspac
                 <DatePicker
                   className={styles.datePickerInput}
                   dateFormat="d/m/Y"
-                  id="endDate"
                   datePickerType="single"
                   {...field}
                   ref={undefined}
-                  invalid={error?.message}
+                  invalid={!!error?.message}
                   invalidText={error?.message}>
                   <DatePickerInput
-                    invalid={error?.message}
+                    invalid={!!error?.message}
                     invalidText={error?.message}
                     placeholder="mm/dd/yyyy"
                     labelText={t('endDate', 'End Date')}
-                    size="xl"
+                    size="lg"
+                    id="endDate"
                   />
                 </DatePicker>
               )}
             />
           </Column>
-          <RelationshipBaselineInfoFormSection />
+          <RelationshipBaselineInfoFormSection patientUuid={personUuid} patientAgeMonths={patientAgeMonths} />
         </Stack>
 
         <ButtonSet className={styles.buttonSet}>

package/src/hooks/useContacts.ts

@@ -24,6 +24,7 @@ const conceptIdNameMap = new Map([
   ['160551', 'Passive referral'],
   ['703', 'Positive'],
   ['664', 'Negative'],
+  ['166563', 'HIV exposed Infant'],
   ['1067', 'Unknown'],
   ['1066', 'No'],
   ['1065', 'Yes'],

package/src/in-patient/in-patient-table/in-patient-table.component.tsx

@@ -16,9 +16,9 @@ import {
 import { Edit } from '@carbon/react/icons';
 import { Encounter } from '../encounter-observations/visit.resource';
 import { useTranslation } from 'react-i18next';
-import { formatDatetime, usePagination, Visit } from '@openmrs/esm-framework';
+import { formatDatetime, launchWorkspace, usePagination, Visit } from '@openmrs/esm-framework';
 import EncounterObservations from '../encounter-observations';
-import { EmptyState, launchPatientWorkspace, PatientChartPagination } from '@openmrs/esm-patient-common-lib';
+import { EmptyState, PatientChartPagination } from '@openmrs/esm-patient-common-lib';
 import styles from './in-patient-table.scss';
 import { mutate } from 'swr';
 
@@ -51,7 +51,7 @@ const InPatientTable: React.FC<InPatientTableProps> = ({ tableRows }) => {
   }, [results]);
 
   const onEncounterEdit = (encounter: Encounter) => {
-    launchPatientWorkspace('patient-form-entry-workspace', {
+    launchWorkspace('patient-form-entry-workspace', {
       workspaceTitle: encounter.form.display,
       mutateForm: () => {
         mutate((key) => typeof key === 'string' && key.startsWith(`/ws/rest/v1/encounter`), undefined, {
@@ -74,7 +74,7 @@ const InPatientTable: React.FC<InPatientTableProps> = ({ tableRows }) => {
 
   return (
     <>
-      <DataTable className={styles.tableContainer} size="sm" useZebraStyles rows={paginatedRows} headers={headers}>
+      <DataTable size="sm" useZebraStyles rows={paginatedRows} headers={headers}>
         {({
           rows,
           headers,