@kenyaemr/esm-express-workflow-app 5.4.4-pre.299 → 5.4.4-pre.3

package/src/components/admissions/admissions-dashboard.utils.test.ts

@@ -1,48 +0,0 @@
-import { describe, expect, it, vi } from 'vitest';
-
-vi.mock('@openmrs/esm-framework', () => ({
-  formatDate: vi.fn((date: Date) => date.toISOString().slice(0, 10)),
-  parseDate: vi.fn((value: string) => new Date(value)),
-}));
-
-const { formatAdministrationInstructions, getDrugDisplay } = await import('./admissions-dashboard.utils');
-
-describe('admissions-dashboard utils', () => {
-  it('formats administration instructions with translated entries', () => {
-    const order = {
-      quantity: 500,
-      quantityUnits: { display: 'ml' },
-      frequency: { display: 'OD' },
-      dose: 20,
-      doseUnits: { display: 'drops/min' },
-      duration: 2,
-      durationUnits: { display: 'days' },
-    } as any;
-
-    const translated = formatAdministrationInstructions(order, (key, defaultValue, options) => {
-      const dictionary = {
-        administrationVolumeValue: 'Vol: {{value}}',
-        administrationFrequencyValue: 'Freq: {{value}}',
-        administrationRateValue: 'Ritmo: {{value}}',
-        administrationDurationValue: 'Duree: {{value}}',
-      };
-
-      const template = dictionary[key as keyof typeof dictionary] ?? defaultValue;
-      return template.replace('{{value}}', String(options?.value ?? '--'));
-    });
-
-    expect(translated).toContain('Vol: 500 ml');
-    expect(translated).toContain('Freq: OD');
-    expect(translated).toContain('Ritmo: 20 drops/min');
-    expect(translated).toContain('Duree: 2 days');
-  });
-
-  it('falls back to non-coded drug name when drug display is missing', () => {
-    const order = {
-      drug: undefined,
-      drugNonCoded: 'Custom compounded mix',
-    } as any;
-
-    expect(getDrugDisplay(order)).toBe('Custom compounded mix');
-  });
-});

package/src/components/admissions/admissions-dashboard.utils.tsx

@@ -1,63 +0,0 @@
-import { formatDate as formatLocalizedDate, parseDate } from '@openmrs/esm-framework';
-import { type Order } from '@openmrs/esm-patient-common-lib';
-import { useTranslation } from 'react-i18next';
-
-type TranslateOptions = {
-  value?: string;
-};
-
-type TranslateFn = (key: string, defaultValue: string, options?: TranslateOptions) => string;
-
-export const formatValue = (value: string | number | undefined | null) => (value || value === 0 ? String(value) : '--');
-
-export const formatOrderDate = (dateValue?: string | null) => {
-  if (!dateValue) {
-    return '--';
-  }
-
-  return formatLocalizedDate(parseDate(dateValue));
-};
-
-export const formatTime = (dateValue?: string | null) => {
-  if (!dateValue) {
-    return '--';
-  }
-
-  const parsed = new Date(dateValue);
-  return Number.isNaN(parsed.getTime()) ? '--' : parsed.toLocaleTimeString([], { hour: '2-digit', minute: '2-digit' });
-};
-
-export const getDoseText = (order: Order) =>
-  [formatValue(order.dose), order.doseUnits?.display].filter((part) => part && part !== '--').join(' ') || '--';
-
-export const getVolumeText = (order: Order) =>
-  [formatValue(order.quantity), order.quantityUnits?.display].filter((part) => part && part !== '--').join(' ') || '--';
-
-export const getDrugDisplay = (order: Order) => {
-  const nonCodedDrugName = (order as Order & { drugNonCoded?: string }).drugNonCoded;
-  return order.drug?.display || nonCodedDrugName || '--';
-};
-
-export const formatAdministrationInstructions = (order: Order, t: TranslateFn) => {
-  const volume = getVolumeText(order);
-  const frequency = formatValue(order.frequency?.display);
-  const rate = getDoseText(order);
-  const duration =
-    [formatValue(order.duration), order.durationUnits?.display].filter((part) => part && part !== '--').join(' ') ||
-    '--';
-
-  return [
-    t('administrationVolumeValue', 'Volume: {{value}}', { value: volume }),
-    t('administrationFrequencyValue', 'Frequency: {{value}}', { value: frequency }),
-    t('administrationRateValue', 'Rate: {{value}}', { value: rate }),
-    t('administrationDurationValue', 'Duration: {{value}}', { value: duration }),
-  ].join(' | ');
-};
-
-export const useFormatAdministrationInstructions = () => {
-  const { t } = useTranslation();
-
-  const translate: TranslateFn = (key, defaultValue, options) => t(key, { defaultValue, ...(options ?? {}) });
-
-  return (order: Order) => formatAdministrationInstructions(order, translate);
-};

package/src/shared/orders/OrdersTabs.tsx

@@ -1,76 +0,0 @@
-import React, { useMemo } from 'react';
-import { useTranslation } from 'react-i18next';
-import { ExtensionSlot } from '@openmrs/esm-framework';
-import { Layer, Tabs, TabList, Tab, TabPanels, TabPanel, TabsSkeleton } from '@carbon/react';
-import { DocumentMultiple_02, RequestQuote } from '@carbon/react/icons';
-import { usePatientOrders } from '../../hooks/useOrders';
-import { type Order } from '../../types/order/order';
-
-type AdditionalTab = {
-  label: string;
-  content: React.ReactNode;
-};
-
-type OrdersTabsProps = {
-  patientUuid: string;
-  patient: fhir.Patient;
-  basePath: string;
-  resultsSlotName: string;
-  orderTypeUuid: string;
-  filter?: (o: Order) => boolean;
-  Table: React.ComponentType<{ orders: Order[]; mutateOrders: () => void }>;
-  additionalTabs?: AdditionalTab[];
-};
-
-export const OrdersTabs: React.FC<OrdersTabsProps> = ({
-  patientUuid,
-  patient,
-  basePath,
-  resultsSlotName,
-  orderTypeUuid,
-  filter,
-  Table,
-  additionalTabs,
-}) => {
-  const { t } = useTranslation();
-  const state = useMemo(() => ({ patientUuid, patient, basePath }), [patientUuid, patient, basePath]);
-  const {
-    data: orders,
-    isLoading,
-    error,
-    mutate: mutateOrders,
-  } = usePatientOrders(patientUuid, 'any', orderTypeUuid, undefined, undefined);
-
-  const filteredOrders = useMemo(() => (filter ? orders?.filter(filter) ?? [] : orders ?? []), [filter, orders]);
-
-  if (isLoading) {
-    return <TabsSkeleton contained />;
-  }
-
-  return (
-    <Layer>
-      <Tabs>
-        <TabList contained>
-          <Tab renderIcon={RequestQuote}>{t('orders', 'Orders')}</Tab>
-          <Tab renderIcon={DocumentMultiple_02}>{t('results', 'Results')}</Tab>
-          {additionalTabs?.map((tab, index) => (
-            <Tab key={`${tab.label}-${index}`}>{tab.label}</Tab>
-          ))}
-        </TabList>
-        <TabPanels>
-          <TabPanel>
-            <Table orders={filteredOrders} mutateOrders={mutateOrders} />
-          </TabPanel>
-          <TabPanel>
-            <ExtensionSlot state={state} name={resultsSlotName} />
-          </TabPanel>
-          {additionalTabs?.map((tab, index) => (
-            <TabPanel key={`${tab.label}-panel-${index}`}>{tab.content}</TabPanel>
-          ))}
-        </TabPanels>
-      </Tabs>
-    </Layer>
-  );
-};
-
-export default OrdersTabs;