@openmrs/esm-stock-management-app 3.0.1-pre.848 → 3.0.1-pre.853

package/src/stock-operations/stock-operations-forms/input-components/qty-uim-selector.test.tsx

@@ -1,64 +1,66 @@
-import { render, screen } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
 import React from 'react';
+import userEvent from '@testing-library/user-event';
+import { render, screen } from '@testing-library/react';
 import { useStockItem } from '../../../stock-items/stock-items.resource';
 import QtyUomSelector from './quantity-uom-selector.component';
 
-jest.mock('../../../stock-items/stock-items.resource');
-jest.mock('react-i18next', () => ({
-  useTranslation: () => ({ t: (key: string) => key }),
+jest.mock('../../../stock-items/stock-items.resource', () => ({
+  useStockItem: jest.fn().mockReturnValue({
+    isLoading: false,
+    item: {},
+    error: null,
+  }),
+  useStockItems: jest.fn().mockReturnValue({
+    isLoading: false,
+    error: null,
+    items: {},
+  }),
+  useStockBatches: jest.fn().mockReturnValue({
+    isLoading: false,
+    error: null,
+    items: {},
+  }),
 }));
 
-const mockUseStockItem = useStockItem as jest.Mock;
+const mockUseStockItem = jest.mocked(useStockItem);
 
 describe('QtyUOMSelector', () => {
   const mockOnValueChange = jest.fn();
   const mockStockItemUuid = 'test-uuid';
-  const mockitem = {
-    uuid: '33225466-93c8-4720-b110-4f445f3764c6',
-    drugUuid: '1776AFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF',
-    drugName: 'Ibuprofen Injection solution  5mg/mL ',
-    conceptUuid: '77897AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',
-    conceptName: 'IBUPROFEN',
-    hasExpiration: true,
-    preferredVendorUuid: 'b7e481ef-06e7-46ba-8a7c-ab077aa3355f',
-    preferredVendorName: 'Kenya Medical Supplies Authority',
-    purchasePrice: 100.0,
-    purchasePriceUoMUuid: '65dc9ec7-0663-4cf0-a35c-6a2d2cf99eee',
-    purchasePriceUoMName: 'Box',
-    purchasePriceUoMFactor: 10.0,
-    dispensingUnitName: 'Tablet',
-    dispensingUnitUuid: '1513AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',
-    dispensingUnitPackagingUoMUuid: '65dc9ec7-0663-4cf0-a35c-6a2d2cf99eee',
-    dispensingUnitPackagingUoMName: 'Box',
-    dispensingUnitPackagingUoMFactor: 10.0,
-    defaultStockOperationsUoMUuid: null,
-    defaultStockOperationsUoMName: null,
-    defaultStockOperationsUoMFactor: null,
-    categoryUuid: '183f9497-b72e-4ebe-ae17-5dcf110ff3b6',
+
+  const mockStockItem = {
+    acronym: null,
     categoryName: 'Other Lymph Node Comments',
+    categoryUuid: '183f9497-b72e-4ebe-ae17-5dcf110ff3b6',
     commonName: 'Ibuprofen 5 MG/ML Injectable Solution',
-    acronym: null,
-    reorderLevel: null,
-    reorderLevelUoMUuid: null,
-    reorderLevelUoMName: null,
-    reorderLevelUoMFactor: null,
-    dateCreated: '2024-09-03T09:46:47.000+0300',
-    creatorGivenName: 'Mark',
+    conceptName: 'IBUPROFEN',
+    conceptUuid: '77897AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',
     creatorFamilyName: 'Miller',
-    voided: false,
+    creatorGivenName: 'Mark',
+    dateCreated: new Date('2024-09-03T09:46:47.000+0300'),
+    defaultStockOperationsUoMFactor: null,
+    defaultStockOperationsUoMName: null,
+    defaultStockOperationsUoMUuid: null,
+    dispensingUnitName: 'Tablet',
+    dispensingUnitPackagingUoMFactor: 10.0,
+    dispensingUnitPackagingUoMName: 'Box',
+    dispensingUnitPackagingUoMUuid: '65dc9ec7-0663-4cf0-a35c-6a2d2cf99eee',
+    dispensingUnitUuid: '1513AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',
+    drugName: 'Ibuprofen Injection solution  5mg/mL ',
+    drugUuid: '1776AFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF',
     expiryNotice: 180,
-    permission: {
-      canView: true,
-      canEdit: true,
-    },
+    hasExpiration: true,
+    isDrug: true,
+    links: [
+      {
+        rel: 'self',
+        uri: 'http://hie.kenyahmis.org/openmrs/ws/rest/v1/stockmanagement/stockitem/33225466-93c8-4720-b110-4f445f3764c6',
+        resourceAlias: 'stockitem',
+      },
+    ],
     packagingUnits: [
       {
-        uuid: '8023ef7d-56da-442f-bc74-319f000840b4',
         factor: 1.0,
-        packagingUomUuid: '162382AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',
-        packagingUomName: 'Vial',
-        stockItemUuid: '33225466-93c8-4720-b110-4f445f3764c6',
         isDefaultStockOperationsUoM: false,
         isDispensingUnit: false,
         links: [
@@ -68,14 +70,14 @@ describe('QtyUOMSelector', () => {
             resourceAlias: 'stockitempackaginguom',
           },
         ],
+        packagingUomName: 'Vial',
+        packagingUomUuid: '162382AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',
         resourceVersion: '1.8',
+        stockItemUuid: '33225466-93c8-4720-b110-4f445f3764c6',
+        uuid: '8023ef7d-56da-442f-bc74-319f000840b4',
       },
       {
-        uuid: '65dc9ec7-0663-4cf0-a35c-6a2d2cf99eee',
         factor: 10.0,
-        packagingUomUuid: '162396AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',
-        packagingUomName: 'Box',
-        stockItemUuid: '33225466-93c8-4720-b110-4f445f3764c6',
         isDefaultStockOperationsUoM: false,
         isDispensingUnit: true,
         links: [
@@ -85,73 +87,113 @@ describe('QtyUOMSelector', () => {
             resourceAlias: 'stockitempackaginguom',
           },
         ],
+        packagingUomName: 'Box',
+        packagingUomUuid: '162396AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',
         resourceVersion: '1.8',
+        stockItemUuid: '33225466-93c8-4720-b110-4f445f3764c6',
+        uuid: '65dc9ec7-0663-4cf0-a35c-6a2d2cf99eee',
       },
     ],
-    references: [],
-    links: [
-      {
-        rel: 'self',
-        uri: 'http://hie.kenyahmis.org/openmrs/ws/rest/v1/stockmanagement/stockitem/33225466-93c8-4720-b110-4f445f3764c6',
-        resourceAlias: 'stockitem',
-      },
-    ],
+    permission: {
+      canApprove: false,
+      canDisplayReceivedItems: false,
+      canEdit: true,
+      canReceiveItems: false,
+      canUpdateBatchInformation: false,
+      canView: true,
+      isRequisitionAndCanIssueStock: false,
+    },
+    preferredVendorName: 'Kenya Medical Supplies Authority',
+    preferredVendorUuid: 'b7e481ef-06e7-46ba-8a7c-ab077aa3355f',
+    purchasePrice: 100.0,
+    purchasePriceUoMFactor: 10.0,
+    purchasePriceUoMName: 'Box',
+    purchasePriceUoMUuid: '65dc9ec7-0663-4cf0-a35c-6a2d2cf99eee',
+    reorderLevel: null,
+    reorderLevelUoMFactor: null,
+    reorderLevelUoMName: null,
+    reorderLevelUoMUuid: null,
     resourceVersion: '1.8',
+    uuid: '33225466-93c8-4720-b110-4f445f3764c6',
+    voided: false,
   };
 
   beforeEach(() => {
-    jest.clearAllMocks();
     mockUseStockItem.mockReturnValue({
       isLoading: false,
-      item: mockitem,
+      item: mockStockItem,
+      error: null,
     });
   });
+
   it('should render Skeleton when loading stock item', () => {
-    mockUseStockItem.mockReturnValue({ isLoading: true });
+    mockUseStockItem.mockReturnValue({ isLoading: true, item: mockStockItem, error: null });
+
     render(<QtyUomSelector stockItemUuid={mockStockItemUuid} onValueChange={mockOnValueChange} />);
+
     expect(screen.getByRole('progressbar')).toBeInTheDocument();
   });
+
   it('should render Inline notification error when error ocuured while fetching item', () => {
     const errorMessage = 'error loading stock item';
-    mockUseStockItem.mockReturnValue({ isLoading: false, error: new Error(errorMessage) });
+    mockUseStockItem.mockReturnValue({ isLoading: false, error: new Error(errorMessage), item: mockStockItem });
+
     render(<QtyUomSelector stockItemUuid={mockStockItemUuid} onValueChange={mockOnValueChange} />);
+
     expect(screen.getByText(errorMessage)).toBeInTheDocument();
     expect(screen.getByRole('status')).toBeInTheDocument();
   });
+
   it('should render Inline notification error when error ocuured while fetching item', () => {
     const errorMessage = 'error loading stock item';
-    mockUseStockItem.mockReturnValue({ isLoading: false, error: new Error(errorMessage) });
+    mockUseStockItem.mockReturnValue({ isLoading: false, error: new Error(errorMessage), item: mockStockItem });
+
     render(<QtyUomSelector stockItemUuid={mockStockItemUuid} onValueChange={mockOnValueChange} />);
+
     expect(screen.getByText(errorMessage)).toBeInTheDocument();
     expect(screen.getByRole('status')).toBeInTheDocument();
   });
 
   it('should display error message when error prop is provided', () => {
     const errorMessage = 'This is an error';
+
     render(<QtyUomSelector stockItemUuid={mockStockItemUuid} onValueChange={mockOnValueChange} error={errorMessage} />);
+
     expect(screen.getByText(errorMessage)).toBeInTheDocument();
   });
+
   it('should display error message when error prop is provided', () => {
     const errorMessage = 'This is an error';
+
     render(<QtyUomSelector stockItemUuid={mockStockItemUuid} onValueChange={mockOnValueChange} error={errorMessage} />);
+
     expect(screen.getByText(errorMessage)).toBeInTheDocument();
   });
 
   it('should render packing uom options', async () => {
+    const user = userEvent.setup();
+
     render(<QtyUomSelector stockItemUuid={mockStockItemUuid} onValueChange={mockOnValueChange} />);
+
     const combobox = screen.getByRole('combobox');
-    await userEvent.click(combobox);
-    mockitem.packagingUnits.forEach(({ factor, packagingUomName }) => {
+    await user.click(combobox);
+
+    mockStockItem.packagingUnits.forEach(({ factor, packagingUomName }) => {
       expect(screen.getByText(`${packagingUomName} - ${factor}`)).toBeInTheDocument();
     });
   });
+
   it('should packing uom selection', async () => {
-    const itemToSelect = mockitem.packagingUnits[1];
+    const user = userEvent.setup();
+    const itemToSelect = mockStockItem.packagingUnits[1];
+
     render(<QtyUomSelector stockItemUuid={mockStockItemUuid} onValueChange={mockOnValueChange} />);
+
     const combobox = screen.getByRole('combobox');
     await userEvent.click(combobox);
+
     const option = screen.getByText(`${itemToSelect.packagingUomName} - ${itemToSelect.factor}`);
-    await userEvent.click(option);
+    await user.click(option);
     expect(mockOnValueChange).toHaveBeenCalledWith(itemToSelect.uuid);
   });
 });

package/src/stock-operations/stock-operations-forms/input-components/quantity-uom-selector.component.tsx

@@ -1,5 +1,5 @@
-import { ComboBox, InlineNotification, SkeletonText } from '@carbon/react';
 import React, { useMemo } from 'react';
+import { ComboBox, InlineNotification, SkeletonText } from '@carbon/react';
 import { useTranslation } from 'react-i18next';
 import { type StockItemPackagingUOMDTO } from '../../../core/api/types/stockItem/StockItemPackagingUOM';
 import { useStockItem } from '../../../stock-items/stock-items.resource';
@@ -32,20 +32,20 @@ const QtyUomSelector: React.FC<QtyUomSelectorProps> = ({ stockItemUuid, error, i
 
   return (
     <ComboBox
-      titleText={t('quantityUom', 'Qty UoM')}
-      name={'stockItemPackagingUOMUuid'}
       id={'stockItemPackagingUOMUuid'}
-      items={item?.packagingUnits ?? []}
-      onChange={(data: { selectedItem?: StockItemPackagingUOMDTO }) => {
-        onValueChange?.(data.selectedItem?.uuid);
-      }}
       initialSelectedItem={initialSelectedItem}
+      invalid={!!error}
+      invalidText={error}
+      items={item?.packagingUnits ?? []}
       itemToString={(s: StockItemPackagingUOMDTO) =>
         s.packagingUomName ? `${s?.packagingUomName} - ${s?.factor} ` : ''
       }
+      name={'stockItemPackagingUOMUuid'}
+      onChange={(data: { selectedItem?: StockItemPackagingUOMDTO }) => {
+        onValueChange?.(data.selectedItem?.uuid);
+      }}
       placeholder={t('filter', 'Filter') + '...'}
-      invalid={error}
-      invalidText={error}
+      titleText={t('quantityUom', 'Qty UoM')}
     />
   );
 };

package/src/stock-operations/stock-operations-forms/input-components/stock-operation-reason-selector.test.tsx

@@ -1,215 +1,97 @@
-import { render, screen } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
 import React from 'react';
-
+import userEvent from '@testing-library/user-event';
+import { render, screen } from '@testing-library/react';
+import { type FieldValues, useFormContext, type UseFormReturn } from 'react-hook-form';
 import { useConfig } from '@openmrs/esm-framework';
-import { useFormContext } from 'react-hook-form';
 import { useConcept } from '../../../stock-lookups/stock-lookups.resource';
 import StockOperationReasonSelector from './stock-operation-reason-selector.component';
 
-// Mock the hooks
-jest.mock('@openmrs/esm-framework', () => ({
-  useConfig: jest.fn(),
-}));
+const mockUseConfig = jest.mocked(useConfig);
+const mockUseConcept = jest.mocked(useConcept);
+const mockUseFormContext = jest.mocked(useFormContext);
 
 jest.mock('react-hook-form', () => ({
   useFormContext: jest.fn(),
   Controller: ({ render }) => render({ field: {}, fieldState: {} }),
 }));
-jest.mock('../../../stock-lookups/stock-lookups.resource');
-jest.mock('react-i18next', () => ({
-  useTranslation: () => ({ t: (key: string) => key }),
-}));
 
-const mockUseConcept = useConcept as jest.Mock;
-const mockUseConfig = useConfig as jest.Mock;
-const mockUseFormContext = useFormContext as jest.Mock;
+jest.mock('../../../stock-lookups/stock-lookups.resource', () => ({
+  useConcept: jest.fn(),
+}));
 
 describe('StockoperationReasonSelector', () => {
-  const mockConcepts = {
-    uuid: '3bbfaa44-d5b8-404d-b4c1-2bf49ad8ce25',
-    display: 'Stock Adjustment Reason',
-    name: {
-      display: 'Stock Adjustment Reason',
-      uuid: '4eb6556a-a2d4-4e85-9b62-4d076a1063fc',
-      name: 'Stock Adjustment Reason',
-      locale: 'en',
-      localePreferred: true,
-      conceptNameType: 'FULLY_SPECIFIED',
-      links: [
-        {
-          rel: 'self',
-          uri: 'http://qa.kenyahmis.org/openmrs/ws/rest/v1/concept/3bbfaa44-d5b8-404d-b4c1-2bf49ad8ce25/name/4eb6556a-a2d4-4e85-9b62-4d076a1063fc',
-          resourceAlias: 'name',
-        },
-        {
-          rel: 'full',
-          uri: 'http://qa.kenyahmis.org/openmrs/ws/rest/v1/concept/3bbfaa44-d5b8-404d-b4c1-2bf49ad8ce25/name/4eb6556a-a2d4-4e85-9b62-4d076a1063fc?v=full',
-          resourceAlias: 'name',
-        },
-      ],
-      resourceVersion: '1.9',
-    },
-    datatype: {
-      uuid: '8d4a48b6-c2cc-11de-8d13-0010c6dffd0f',
-      display: 'Coded',
-      links: [
-        {
-          rel: 'self',
-          uri: 'http://qa.kenyahmis.org/openmrs/ws/rest/v1/conceptdatatype/8d4a48b6-c2cc-11de-8d13-0010c6dffd0f',
-          resourceAlias: 'conceptdatatype',
-        },
-      ],
-    },
-    conceptClass: {
-      uuid: '8d491e50-c2cc-11de-8d13-0010c6dffd0f',
-      display: 'Question',
-      links: [
-        {
-          rel: 'self',
-          uri: 'http://qa.kenyahmis.org/openmrs/ws/rest/v1/conceptclass/8d491e50-c2cc-11de-8d13-0010c6dffd0f',
-          resourceAlias: 'conceptclass',
-        },
-      ],
-    },
-    set: false,
-    version: null,
-    retired: false,
-    names: [
-      {
-        uuid: '4eb6556a-a2d4-4e85-9b62-4d076a1063fc',
-        display: 'Stock Adjustment Reason',
-        links: [
-          {
-            rel: 'self',
-            uri: 'http://qa.kenyahmis.org/openmrs/ws/rest/v1/concept/3bbfaa44-d5b8-404d-b4c1-2bf49ad8ce25/name/4eb6556a-a2d4-4e85-9b62-4d076a1063fc',
-            resourceAlias: 'name',
-          },
-        ],
-      },
-      {
-        uuid: '36eb0855-c810-4816-9bed-1de5c615e702',
-        display: 'Stock Adjustment Reason',
-        links: [
-          {
-            rel: 'self',
-            uri: 'http://qa.kenyahmis.org/openmrs/ws/rest/v1/concept/3bbfaa44-d5b8-404d-b4c1-2bf49ad8ce25/name/36eb0855-c810-4816-9bed-1de5c615e702',
-            resourceAlias: 'name',
-          },
-        ],
-      },
-    ],
-    descriptions: [
-      {
-        uuid: '67311e07-1935-448b-8305-7d11abf0de63',
-        display: 'Stock Adjustment Reason',
-        links: [
-          {
-            rel: 'self',
-            uri: 'http://qa.kenyahmis.org/openmrs/ws/rest/v1/concept/3bbfaa44-d5b8-404d-b4c1-2bf49ad8ce25/description/67311e07-1935-448b-8305-7d11abf0de63',
-            resourceAlias: 'description',
-          },
-        ],
-      },
-    ],
-    mappings: [],
+  const mockConcept = {
     answers: [
       {
         uuid: '165420AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',
         display: 'Drug not available due to expired medication',
-        links: [
-          {
-            rel: 'self',
-            uri: 'http://qa.kenyahmis.org/openmrs/ws/rest/v1/concept/165420AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',
-            resourceAlias: 'concept',
-          },
-        ],
       },
       {
         uuid: '160584AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',
         display: 'Lost or ran out of medication',
-        links: [
-          {
-            rel: 'self',
-            uri: 'http://qa.kenyahmis.org/openmrs/ws/rest/v1/concept/160584AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',
-            resourceAlias: 'concept',
-          },
-        ],
       },
       {
         uuid: '122835AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',
         display: 'Work Shift Change',
-        links: [
-          {
-            rel: 'self',
-            uri: 'http://qa.kenyahmis.org/openmrs/ws/rest/v1/concept/122835AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',
-            resourceAlias: 'concept',
-          },
-        ],
       },
       {
         uuid: '160561AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',
         display: 'New drug available',
-        links: [
-          {
-            rel: 'self',
-            uri: 'http://qa.kenyahmis.org/openmrs/ws/rest/v1/concept/160561AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',
-            resourceAlias: 'concept',
-          },
-        ],
       },
     ],
-    setMembers: [],
-    attributes: [],
-    links: [
-      {
-        rel: 'self',
-        uri: 'http://qa.kenyahmis.org/openmrs/ws/rest/v1/concept/3bbfaa44-d5b8-404d-b4c1-2bf49ad8ce25',
-        resourceAlias: 'concept',
-      },
-      {
-        rel: 'full',
-        uri: 'http://qa.kenyahmis.org/openmrs/ws/rest/v1/concept/3bbfaa44-d5b8-404d-b4c1-2bf49ad8ce25?v=full',
-        resourceAlias: 'concept',
-      },
-    ],
-    resourceVersion: '2.0',
   };
+
   beforeEach(() => {
-    jest.clearAllMocks();
-    mockUseConfig.mockReturnValue({ stockAdjustmentReasonUUID: 'uuid' });
+    mockUseConfig.mockReturnValue({
+      stockAdjustmentReasonUUID: '3bbfaa44-d5b8-404d-b4c1-2bf49ad8ce25',
+    });
+    mockUseFormContext.mockReturnValue({
+      control: {},
+      formState: { errors: {} },
+    } as UseFormReturn<FieldValues>);
     mockUseConcept.mockReturnValue({
       isLoading: false,
-      items: mockConcepts,
+      items: mockConcept as any,
+      error: null,
     });
   });
 
   it('should display loading state while loading reason concepts', () => {
-    mockUseFormContext.mockReturnValue({ control: {} });
+    mockUseFormContext.mockReturnValue({ control: {} } as UseFormReturn<FieldValues>);
     mockUseConcept.mockReturnValue({
       isLoading: true,
-      items: mockConcepts,
+      items: mockConcept as any,
+      error: null,
     });
+
     render(<StockOperationReasonSelector />);
+
     expect(screen.getByRole('progressbar')).toBeInTheDocument();
   });
+
   it('should display error notification when error encountered while fetching concepts', () => {
     const errorMessahe = 'Error message';
     mockUseConcept.mockReturnValue({
       isLoading: false,
-      items: mockConcepts,
+      items: mockConcept as any,
       error: new Error(errorMessahe),
     });
+
     render(<StockOperationReasonSelector />);
+
     expect(screen.getByRole('status')).toBeInTheDocument();
     expect(screen.getByText(errorMessahe)).toBeInTheDocument();
   });
 
   it('renders ComboBox with reasons', async () => {
+    const user = userEvent.setup();
+
     render(<StockOperationReasonSelector />);
+
     const combobox = screen.getByRole('combobox');
-    await userEvent.click(combobox);
-    mockConcepts.answers.forEach((ans) => {
+    await user.click(combobox);
+
+    mockConcept.answers.forEach((ans) => {
       expect(screen.getByText(`${ans?.display}`)).toBeInTheDocument();
     });
   });